From aba1098b7eb06fe185dc5d0f5aaaa33e2f70fa0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Beraud?= <hberaud@redhat.com>
Date: Mon, 3 Feb 2020 18:09:41 +0100
Subject: [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: I02e2d11d38d2aa4182e8d466519b99f05943701f
---
 .zuul.yaml                                                     | 2 --
 doc/requirements.txt                                           | 3 +--
 releasenotes/notes/drop-python27-support-2308d7fbcd66cc22.yaml | 5 +++++
 setup.cfg                                                      | 8 +++-----
 setup.py                                                       | 8 --------
 tox.ini                                                        | 4 ++--
 6 files changed, 11 insertions(+), 19 deletions(-)
 create mode 100644 releasenotes/notes/drop-python27-support-2308d7fbcd66cc22.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index 35eecfd..a60d493 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,10 +1,8 @@
 - project:
     templates:
       - check-requirements
-      - lib-forward-testing
       - lib-forward-testing-python3
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - periodic-stable-jobs
       - publish-openstack-docs-pti
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 32edd4f..e0781e8 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,8 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 openstackdocstheme>=1.20.0 # Apache-2.0
-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
 doc8>=0.6.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 sphinxcontrib-apidoc>=0.2.0  # BSD
diff --git a/releasenotes/notes/drop-python27-support-2308d7fbcd66cc22.yaml b/releasenotes/notes/drop-python27-support-2308d7fbcd66cc22.yaml
new file mode 100644
index 0000000..c5195c0
--- /dev/null
+++ b/releasenotes/notes/drop-python27-support-2308d7fbcd66cc22.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Support for Python 2.7 has been dropped. The latest version of Python now
+    supported is Python 3.6.
diff --git a/setup.cfg b/setup.cfg
index 898ac13..37155c4 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/oslo.db/latest
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,11 +14,11 @@ 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
 
 [extras]
 # So e.g. nova can test-depend on oslo.db[mysql]
@@ -40,9 +41,6 @@ oslo.db.migration =
     alembic = oslo_db.sqlalchemy.migration_cli.ext_alembic:AlembicExtension
     migrate = oslo_db.sqlalchemy.migration_cli.ext_migrate:MigrateExtension
 
-[bdist_wheel]
-universal = 1
-
 [compile_catalog]
 directory = oslo_db/locale
 domain = oslo_db
diff --git a/setup.py b/setup.py
index 566d844..f63cc23 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>=2.0.0'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index 0283847..89c4989 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 minversion = 3.1
-envlist = py27,py37,pep8
-ignore_basepython_conflict = True
+envlist = py37,pep8
+ignore_basepython_conflict = true
 
 [testenv]
 basepython = python3
-- 
cgit v1.2.1