From 5863c2bdf6b9aef016d55f9f07105aee60416246 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 4 Apr 2020 12:33:23 +0200
Subject: [PATCH] Cleanup py27 support

Make a few cleanups:
- Remove python-jobs, ussuri-jobs is enough
- 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
- Update classifiers
- Update requirements, no need for python_version anymore
- Remove html_last_updated_fmt from conf.py since it's set
  by newer openstackdocstheme, update requirement of openstackdocstheme.

Change-Id: I13f089de86ce3eb30770c91ee5372652e40fb52b
---
 .zuul.yaml            | 1 -
 doc/requirements.txt  | 4 ++--
 doc/source/conf.py    | 1 -
 lower-constraints.txt | 2 +-
 setup.cfg             | 3 +++
 setup.py              | 9 ---------
 6 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 842508b..d57f9ab 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - openstack-lower-constraints-jobs
-      - openstack-python-jobs
       - openstack-python3-ussuri-jobs
       - release-notes-jobs-python3
       - openstackclient-plugin-jobs
diff --git a/doc/requirements.txt b/doc/requirements.txt
index a182145..399d42c 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,6 +1,6 @@
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 sphinxcontrib-apidoc>=0.2.0  # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
+openstackdocstheme>=1.32.1 # Apache-2.0
 
 # releasenotes
 reno>=2.5.0 # Apache-2.0
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 3995766..f8e3b8f 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,7 +37,6 @@ apidoc_excluded_paths = ['tests/*']
 
 apidoc_separate_modules = True
 
-# Must set this variable to include year, month, day, hours, and minutes.
 html_last_updated_fmt = '%Y-%m-%d %H:%M'
 
 # autodoc generation is a bit aggressive and a nuisance when doing heavy
diff --git a/lower-constraints.txt b/lower-constraints.txt
index d18715f..a0bc64b 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -26,7 +26,7 @@ msgpack-python==0.4.0
 msgpack==0.5.6
 netaddr==0.7.19
 netifaces==0.10.6
-openstackdocstheme==1.18.1
+openstackdocstheme==1.32.1
 oslo.config==5.2.0
 oslo.context==2.20.0
 oslo.i18n==3.15.3
diff --git a/setup.cfg b/setup.cfg
index bd47c4e..e75d605 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/python-congressclient/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,6 +14,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
diff --git a/setup.py b/setup.py
index 566d844..cd35c3c 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)