Update .gitlab-ci.yml file

.gitlab-ci.yml

@@ -34,16 +34,7 @@ before_script:
 # Python 2.7 end of support 2020-01
 # Python 3.4 end of support 2019-03
 # Python 3.5 end of support 2020-09
-
-# End of support 2021-12
-py36-build:
-  stage: build
-  image: python:3.6
-  script:
-    - export TOXENV=py36-build
-    - tox -s true
-  tags:
-    - win10
+# Python 3.6 end of support 2021-12
 
 # End of support 2023-06
 py37-build:
@@ -60,9 +51,6 @@ py38-build:
   script:
     - export TOXENV=py38-build
     - tox -s true
-  tags:
-    - win10
-
 
 py38-test:
   stage: test
@@ -70,7 +58,9 @@ py38-test:
   script:
     - export TOXENV=py38-test
     - tox -s true
-
+  tags:
+    - windows
+    - linux
 
 py38-lint:
   stage: test
@@ -80,7 +70,6 @@ py38-lint:
     - export TOXENV=py38-lint
     - tox -r -s true
 
-
 py38-safety:
   stage: test
   image: python:3.8
@@ -88,7 +77,6 @@ py38-safety:
     - export TOXENV=py38-safety
     - tox -s true
 
-
 py38-metric:
   stage: test
   image: python:3.8
@@ -115,9 +103,9 @@ include:
 #     - tox -s true
 
 
-py36-release-pypi:
+py38-release-pypi:
   stage: deploy
-  image: python:3.6
+  image: python:3.8
   script:
     - pip install twine
     - python setup.py sdist bdist_wheel