From ac04e5d415c03f8594e1d3344c51bfe6c9d3a49d Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 4 Apr 2020 17:05:21 +0200
Subject: [PATCH] Cleanup py27 support

Make a few cleanups:
- Remove python 2.7 stanza from setup.py
- Add requires on python >= 3.6 to setup.cfg so that pypi and pip
  know about the requirement
- Remove obsolete sections from setup.cfg
- Update classifiers
- Update requirements, no need for python_version anymore
- Remove html_last_updated_fmt from conf.py, this is not needed with
  openstackdocstheme anymore; update openstackdocstheme requirement

Change-Id: I66d7b502349de38bc2b646ed99cf5a41471d81bf
---
 doc/requirements.txt        | 5 ++---
 doc/source/conf.py          | 1 -
 lower-constraints.txt       | 2 +-
 releasenotes/source/conf.py | 1 -
 setup.cfg                   | 7 +++----
 setup.py                    | 9 ---------
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index af1aeb8b3..8dc65ed51 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,7 +1,6 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.32.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,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 294de7129..4b4300592 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -16,7 +16,6 @@ extensions = [
 repository_name = 'openstack/python-neutronclient'
 bug_project = 'python-neutronclient'
 bug_tag = 'doc'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/lower-constraints.txt b/lower-constraints.txt
index b37c137a0..3a51d5545 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -46,7 +46,7 @@ msgpack-python==0.4.0
 munch==2.1.0
 netaddr==0.7.18
 netifaces==0.10.4
-openstackdocstheme==1.18.1
+openstackdocstheme==1.32.1
 openstacksdk==0.11.2
 os-client-config==1.28.0
 os-service-types==1.2.0
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index a029757ed..f7ec3924b 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -46,7 +46,6 @@ extensions = [
 repository_name = 'openstack/python-neutronclient'
 bug_project = 'python-neutronclient'
 bug_tag = 'doc'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/setup.cfg b/setup.cfg
index d1fb096c2..f9a0f431a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,7 @@ description-file =
 author = OpenStack Networking Project
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/python-neutronclient/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Developers
@@ -14,6 +15,8 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
@@ -22,10 +25,6 @@ classifier =
 packages =
     neutronclient
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     neutron = neutronclient.shell:main
diff --git a/setup.py b/setup.py
index 566d84432..cd35c3c35 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# 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)