From f8bf36efa2b3001b7f33bee0ec8da478540b176c Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Sun, 14 Apr 2019 18:56:20 +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: I00d4b8a6f5687811af58960d5538c50ebe9fac4c
---
 .zuul.yaml | 20 --------------------
 setup.cfg  |  2 +-
 tox.ini    | 17 +----------------
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 8d7d485a9..23352dfd6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -90,13 +90,6 @@
       database: postgres
       plugin: simple-crypto
 
-- job:
-    name: barbican-simple-crypto-devstack-functional-py35
-    parent: barbican-devstack-functional-base
-    vars:
-      python_version: py35
-      plugin: simple-crypto
-
 - job:
     name: barbican-dogtag-devstack-fedora-latest
     nodeset: devstack-single-node-fedora-latest
@@ -135,13 +128,6 @@
     vars:
       cursive: 1
 
-- job:
-    name: barbican-simple-crypto-devstack-tempest-py35
-    parent: barbican-devstack-tempest-base
-    voting: false
-    vars:
-      python_version: py35
-
 - job:
     name: grenade-devstack-barbican
     parent: legacy-dsvm-base
@@ -166,7 +152,6 @@
       - openstack-cover-jobs
       - openstack-lower-constraints-jobs
       - openstack-python-jobs
-      - openstack-python35-jobs
       - openstack-python36-jobs
       - openstack-python37-jobs
       - publish-openstack-docs-pti
@@ -175,7 +160,6 @@
       jobs:
         - barbican-simple-crypto-devstack-tempest
         - barbican-simple-crypto-devstack-functional
-        - barbican-simple-crypto-devstack-functional-py35
         - barbican-simple-crypto-devstack-functional-postgres
         - barbican-dogtag-devstack-functional-fedora-latest
         - barbican-kmip-devstack-functional:
@@ -199,11 +183,7 @@
       jobs:
         - barbican-simple-crypto-devstack-tempest
         - barbican-simple-crypto-devstack-functional
-        - barbican-simple-crypto-devstack-functional-py35
         - barbican-dogtag-devstack-functional-fedora-latest
         - barbican-vault-devstack-functional
         - grenade-devstack-barbican:
             voting: false
-    experimental:
-      jobs:
-        - barbican-simple-crypto-devstack-tempest-py35
diff --git a/setup.cfg b/setup.cfg
index 65d320c3d..704456dae 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,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
 
 [files]
 data_files =
diff --git a/tox.ini b/tox.ini
index ec1d9b53f..65d54ab58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 2.0
-envlist = py36,py35,py27,pep8,docs
+envlist = py36,py27,pep8,docs
 skipsdist = True
 
 [testenv]
@@ -131,21 +131,6 @@ passenv = KMIP_PLUGIN_ENABLED
           VAULT_PLUGIN_ENABLED
           PKCS11_PLUGIN_ENABLED
 
-[testenv:py35functional]
-basepython = python3
-deps = -r{toxinidir}/test-requirements.txt
-setenv =
-    OS_TEST_PATH={toxinidir}/functionaltests
-commands =
-    /usr/bin/find . -type f -name "*.py[c|o]" -delete
-    stestr run --slowest {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
-passenv = KMIP_PLUGIN_ENABLED
-          VAULT_PLUGIN_ENABLED
-          PKCS11_PLUGIN_ENABLED
-
 [testenv:cmd]
 basepython = python3
 # This tox env is purely to make local test development easier