From 3107b452467537f4eef3d9ecfb5e35d110d19662 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Thu, 11 Jul 2019 21:33:25 +0200
Subject: [PATCH] py3: use the train test template and other updates

Use the unified unit test Zuul template for train, according the
community goal. Also, update the setup.cfg classifiers accordingly.

Update the debug test environment. Adding "debug-py36" is enough;
if a distribution supports 3.7, the "debug" tox environment
can be used.

Finally, keep only the most recent environment in the default
set executed when calling tox.

Story: #2005924
Task: #34244

Change-Id: Iad4a6e933ad416eb67a2f144540fe79e97938bec
---
 .zuul.yaml | 4 +---
 setup.cfg  | 2 +-
 tox.ini    | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 29eb3e52..2ce6102a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,9 +3,7 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
-      - openstack-python36-jobs
-      - openstack-python37-jobs
+      - openstack-python3-train-jobs
       - publish-openstack-docs-pti
       - check-requirements
       - release-notes-jobs-python3
diff --git a/setup.cfg b/setup.cfg
index e5adcada..f86f8a8c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,8 +17,8 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
 
 [global]
 setup-hooks = pbr.hooks.setup_hook
diff --git a/tox.ini b/tox.ini
index 62fe6477..c1c11041 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py35,py36,py37,pypy,pep8,releasenotes
+envlist = py27,py37,pypy,pep8,releasenotes
 minversion = 2.0
 skipsdist = True
 
@@ -27,8 +27,8 @@ commands = oslo_debug_helper -t saharaclient/tests/unit {posargs}
 basepython = python2.7
 commands = oslo_debug_helper -t saharaclient/tests/unit {posargs}
 
-[testenv:debug-py35]
-basepython = python3.5
+[testenv:debug-py36]
+basepython = python3.6
 commands = oslo_debug_helper -t saharaclient/tests/unit {posargs}
 
 [testenv:cover]