From 0d84429800639596a060ac7f16a5d54c9eef6799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Tue, 4 Feb 2020 17:01:06 +0100
Subject: [PATCH] [ussuri][goal] Drop python 2.7 support and testing

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

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: I99e49c84779439317a9f13307c7e7d2fc092d7fb
Sem-Ver: api-break
---
 .zuul.yaml                                      |  1 -
 doc/requirements.txt                            |  3 +--
 .../drop-python27-support-bd23b9c4556739ba.yaml |  5 +++++
 requirements.txt                                |  1 -
 setup.cfg                                       | 17 +++--------------
 setup.py                                        |  8 --------
 tox.ini                                         |  7 ++++---
 7 files changed, 13 insertions(+), 29 deletions(-)
 create mode 100644 releasenotes/notes/drop-python27-support-bd23b9c4556739ba.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index b0f1290..3fb090f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,7 +1,6 @@
 - project:
     templates:
       - publish-openstack-docs-pti
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - check-requirements
       - release-notes-jobs-python3
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 216af9c..e8e130a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,7 +2,6 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-sphinx>=1.8.0,<2.0.0;python_version=='2.7' # BSD
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 reno>=2.5.0
 openstackdocstheme>=1.20.0
diff --git a/releasenotes/notes/drop-python27-support-bd23b9c4556739ba.yaml b/releasenotes/notes/drop-python27-support-bd23b9c4556739ba.yaml
new file mode 100644
index 0000000..5684dbe
--- /dev/null
+++ b/releasenotes/notes/drop-python27-support-bd23b9c4556739ba.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Support for Python 2.7 has been dropped. The minimum version of Python now
+    supported is Python 3.6.
diff --git a/requirements.txt b/requirements.txt
index e1ab5d5..d450e06 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,5 +5,4 @@
 Babel>=2.3.4 # BSD
 oslo.config>=5.2.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
-enum34>=1.0.4;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
 PrettyTable<0.8,>=0.7.1 # BSD
diff --git a/setup.cfg b/setup.cfg
index ea04511..9ca2908 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = http://launchpad.net/oslo
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,25 +14,16 @@ 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
 
 [files]
 packages =
     oslo_upgradecheck
 
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = oslo.upgradecheck/locale
 domain = oslo.upgradecheck
@@ -45,6 +37,3 @@ input_file = oslo.upgradecheck/locale/oslo.upgradecheck.pot
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = oslo.upgradecheck/locale/oslo.upgradecheck.pot
-
-[wheel]
-universal = true
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 eeb1e4e..f126c3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
-minversion = 3.1
-envlist = py27,py37,pep8
+minversion = 3.1.1
+envlist = py37,pep8
 skipsdist = True
-ignore_basepython_conflict = True
+ignore_basepython_conflict = true
 
 [testenv]
 basepython = python3
@@ -55,6 +55,7 @@ deps =
   -r{toxinidir}/requirements.txt
 
 [testenv:releasenotes]
+deps = {[testenv:docs]deps}
 whitelist_externals =
   rm
 commands =