From a7cda44dfe4c217c36e7bf68a420d40f3e790121 Mon Sep 17 00:00:00 2001
From: manchandavishal <manchandavishal143@gmail.com>
Date: Tue, 26 Mar 2019 08:47:05 +0000
Subject: [PATCH] Switch python3 versions of test jobs to match Train PTI

In Train, we will use python 3.6 and 3.7 for python3 runtime
in our gate jobs [1]. This commit drops python 3.5 and adds python 3.7.

Redundant entries in tox.ini are cleanup along with python3.5 removal.

[1] https://governance.openstack.org/tc/reference/runtimes/train.html

Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
Change-Id: Ideb2e7f6e7e3bd0986e5f6d400912a3e4e392e14
---
 .zuul.yaml |  3 +--
 setup.cfg  |  5 ++---
 tox.ini    | 18 +++---------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 5cb372d8..43753216 100644
--- a/.zuul.yaml
+++ b/.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:
diff --git a/setup.cfg b/setup.cfg
index 675f3e82..eaeaaca2 100644
--- a/setup.cfg
+++ b/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 =
diff --git a/tox.ini b/tox.ini
index ea5f33e2..9703dcee 100644
--- a/tox.ini
+++ b/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 =