From 0d4f1d64b6f65535094853af234b97cbb1eeff28 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 15 Apr 2019 01:13:48 +0000
Subject: [PATCH] Dropping the py35 testing

All the integration testing has been moved to
Bionic now[1] and py3.5 is not tested runtime for
Train or stable/stein[2].

As per below ML thread, we are good to drop the py35
testing now:
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/005097.html

[1] http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004647.html
[2]
https://governance.openstack.org/tc/reference/runtimes/stein.html
https://governance.openstack.org/tc/reference/runtimes/train.html

Change-Id: I1874f96f78cb403e6f3a56a49cb83df40d531f8d
---
 .zuul.yaml | 24 ++++++++++++------------
 setup.cfg  |  2 +-
 tox.ini    | 12 ++++++------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index bb5001fdd..dc84a70c3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,23 +19,23 @@
       bindep_profile: rabbit
 
 - job:
-    name: oslo.messaging-tox-py35-func-amqp1
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-amqp1
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-amqp1
+      tox_envlist: py36-func-amqp1
 
 - job:
-    name: oslo.messaging-tox-py35-func-kafka
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-kafka
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-kafka
+      tox_envlist: py36-func-kafka
       bindep_profile: kafka
 
 - job:
-    name: oslo.messaging-tox-py35-func-rabbit
-    parent: openstack-tox-py35
+    name: oslo.messaging-tox-py36-func-rabbit
+    parent: openstack-tox-py36
     vars:
-      tox_envlist: py35-func-rabbit
+      tox_envlist: py36-func-rabbit
       bindep_profile: rabbit
 
 # Begin v3 native jobs
@@ -232,11 +232,11 @@
             voting: false
         - oslo.messaging-tox-py27-func-kafka:
             voting: false
-        - oslo.messaging-tox-py35-func-rabbit:
+        - oslo.messaging-tox-py36-func-rabbit:
             voting: false
-        - oslo.messaging-tox-py35-func-amqp1:
+        - oslo.messaging-tox-py36-func-amqp1:
             voting: false
-        - oslo.messaging-tox-py35-func-kafka:
+        - oslo.messaging-tox-py36-func-kafka:
             voting: false
 
         - oslo.messaging-src-dsvm-full-rabbit
diff --git a/setup.cfg b/setup.cfg
index 87f3bb51b..2d1ecf603 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,7 +16,7 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
 
 [extras]
 # package dependencies for optional (non-rabbitmq) messaging drivers.
diff --git a/tox.ini b/tox.ini
index 82405bb48..c1ef73cfa 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,8 +48,8 @@ setenv =
     TRANSPORT_DRIVER=rabbit
 commands = pifpaf run rabbitmq --  stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-rabbit]
-basepython = python3.5
+[testenv:py36-func-rabbit]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_DRIVER=rabbit
@@ -73,8 +73,8 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-amqp1]
-basepython = python3.5
+[testenv:py36-func-amqp1]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_URL=amqp://stackqpid:secretqpid@127.0.0.1:65123//
@@ -83,8 +83,8 @@ setenv =
     WORKDIR={toxworkdir}
 commands = {toxinidir}/tools/setup-test-env-amqp1.sh stestr run --slowest {posargs:oslo_messaging.tests.functional}
 
-[testenv:py35-func-kafka]
-basepython = python3.5
+[testenv:py36-func-kafka]
+basepython = python3.6
 setenv =
     {[testenv]setenv}
     TRANSPORT_URL=kafka://127.0.0.1:9092/