Merge "Switch python3 versions of test jobs to match Train PTI"

.zuul.yaml

@@ -27,8 +27,7 @@
       - nodejs4-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs-horizon
-      - openstack-python35-jobs-horizon
-      - openstack-python36-jobs-horizon
+      - openstack-python3-train-jobs-horizon
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
     check:

setup.cfg

@@ -16,9 +16,8 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
-    Programming Language :: Python :: 3.4
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [files]
 packages =

tox.ini

@@ -1,6 +1,6 @@
 [tox]
-envlist = py27,py35,py3-dj111,pep8,releasenotes
-minversion = 2.3.2
+envlist = py27,py36,py37,py3-dj111,pep8,releasenotes
+minversion = 2.5.0
 skipsdist = True
 
 [testenv]
@@ -16,14 +16,10 @@ setenv =
 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands =
-  py27: {[unit_tests]commands}
-  py35: {[unit_tests]commands}
-  py36: {[unit_tests]commands}
+commands = {[unit_tests]commands}
 
 [unit_tests]
 commands =
-  pip install -r requirements.txt
   python manage.py test heat_dashboard.test --settings=heat_dashboard.test.settings --exclude-tag integration
 
 [testenv:integration]
@@ -50,14 +46,6 @@ commands =
   coverage xml
   coverage html
 
-[testenv:py35]
-basepython = python3.5
-commands = {[unit_tests]commands}
-
-[testenv:py36]
-basepython = python3.6
-commands = {[unit_tests]commands}
-
 [testenv:py3-dj111]
 basepython = python3
 commands =