From b15f68e52dd2661b825551dfef1ede954828f7eb Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 3 Feb 2020 12:58:28 -0600
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

OpenStack is dropping the py2.7 support in ussuri cycle.

openstack-health is ready with python 3 and ok to drop the
python 2.7 support.

Complete discussion & schedule can be found in
- http://lists.openstack.org/pipermail/openstack-discuss/2019-October/010142.html
- https://etherpad.openstack.org/p/drop-python2-support

Ussuri Communtiy-wide goal:
https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html

Change-Id: Iaaef4a66fec148e882e3a6a984b07a80c7fb1285
---
 .zuul.yaml                                           |  4 ++--
 doc/requirements.txt                                 |  3 +--
 releasenotes/notes/drop-py-2-7-0bd1c0e65d009181.yaml |  6 ++++++
 setup.cfg                                            |  4 ++--
 tox.ini                                              | 12 ++++--------
 5 files changed, 15 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-0bd1c0e65d009181.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 209f538c..c0cf8c08 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,6 +1,6 @@
 - project:
     templates:
-      - openstack-python-jobs
       - horizon-nodejs10-jobs
-      - openstack-python3-train-jobs
+      - openstack-python35-jobs
+      - openstack-python3-ussuri-jobs
       - build-openstack-docs-pti
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 3cf31642..12d19579 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,5 +3,4 @@
 # process, which may cause wedges in the gate later.
 openstackdocstheme>=1.18.1 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
diff --git a/releasenotes/notes/drop-py-2-7-0bd1c0e65d009181.yaml b/releasenotes/notes/drop-py-2-7-0bd1c0e65d009181.yaml
new file mode 100644
index 00000000..f4e2c503
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-0bd1c0e65d009181.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. Last release of openstack-health
+    to support py2.7 is OpenStack Train. The minimum version of Python now
+    supported by openstack-health is Python 3.5.
diff --git a/setup.cfg b/setup.cfg
index 5da9a813..e3877849 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://opendev.org/openstack/openstack-health/
+python-requires = >=3.5
 classifier =
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
@@ -13,9 +14,8 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
-    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
 
diff --git a/tox.ini b/tox.ini
index b2c3a681..43205986 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
-envlist = py27,py36,py37,pep8,npm-test,npm-lint
-minversion = 2.0
+envlist = py36,py37,pep8,npm-test,npm-lint
+minversion = 3.1.1
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install -U {opts} {packages}
@@ -15,11 +17,9 @@ commands =
          stestr run {posargs}
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        -r{toxinidir}/doc/requirements.txt
@@ -29,12 +29,10 @@ commands =
 whitelist_externals = rm
 
 [testenv:pep8]
-basepython = python3
 commands =
    flake8 {toxinidir}/openstack_health {posargs}
 
 [testenv:cover]
-basepython = python3
 setenv =
    {[testenv]setenv}
    PYTHON = coverage run --source openstack_health --parallel-mode
@@ -54,9 +52,7 @@ show-source = True
 exclude = .git,.venv,.tox,dist,doc,openstack,*egg
 
 [testenv:npm-test]
-basepython = python3
 commands = npm test
 
 [testenv:npm-lint]
-basepython = python3
 commands = npm run lint --silent