From 59aec6a7b71e4afdb5637bc70250957451e8f7d8 Mon Sep 17 00:00:00 2001
From: Ghanshyam Mann <gmann@ghanshyammann.com>
Date: Mon, 3 Feb 2020 13:03:50 -0600
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

os-performance-tools 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: I1ced6583d61418ca5cd2deb72b7e3f7a3ec986e2
---
 .zuul.yaml                                           |  3 +--
 releasenotes/notes/drop-py-2-7-495369ce08f2b3d6.yaml |  5 +++++
 setup.cfg                                            |  6 ++++--
 setup.py                                             |  8 --------
 tox.ini                                              | 11 ++++-------
 5 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/drop-py-2-7-495369ce08f2b3d6.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 516dcef..7b1d6c5 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,5 +2,4 @@
     templates:
       - check-requirements
       - publish-openstack-docs-pti
-      - openstack-python-jobs
-      - openstack-python3-train-jobs
+      - openstack-python3-ussuri-jobs
diff --git a/releasenotes/notes/drop-py-2-7-495369ce08f2b3d6.yaml b/releasenotes/notes/drop-py-2-7-495369ce08f2b3d6.yaml
new file mode 100644
index 0000000..01d87ec
--- /dev/null
+++ b/releasenotes/notes/drop-py-2-7-495369ce08f2b3d6.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Python 2.7 support has been dropped. The minimum version of Python now
+    supported by os-performance-tools is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index bae89f6..d5bf536 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://docs.openstack.org/os-performance-tools/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,11 +14,12 @@ 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.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: Implementation :: CPython
+
 
 [entry_points]
 console_scripts =
diff --git a/setup.py b/setup.py
index 056c16c..1f988cd 100644
--- a/setup.py
+++ b/setup.py
@@ -16,14 +16,6 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index b525cfb..2a9df8c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,9 +1,11 @@
 [tox]
-minversion = 2.0
-envlist = py27,py36,py37,pypy,pep8
+minversion = 3.1.1
+envlist = py36,py37,pypy,pep8
 skipsdist = True
+ignore_basepython_conflict = True
 
 [testenv]
+basepython = python3
 usedevelop = True
 setenv =
    VIRTUAL_ENV={envdir}
@@ -11,19 +13,15 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-basepython = python3
 commands = flake8
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:cover]
-basepython = python3
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-basepython = python3
 deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/doc/requirements.txt
@@ -31,7 +29,6 @@ commands =
   sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:debug]
-basepython = python3
 commands = oslo_debug_helper {posargs}
 
 [flake8]