From 35e83918f41d936aa2f5e01519ed1444cb106ef9 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 8 Apr 2020 08:36:45 +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

Change-Id: Id04f2ca5b879ee1f37cd349ff85ebec01389213a
---
 setup.cfg | 13 +++----------
 setup.py  |  9 ---------
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 96782dcb4c..0155d201d9 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/keystone/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
@@ -35,16 +38,6 @@ mongodb =
 bandit =
   bandit>=1.1.0 # Apache-2.0
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
-
-[egg_info]
-tag_build =
-tag_date = 0
-tag_svn_revision = 0
-
 [compile_catalog]
 directory = keystone/locale
 domain = keystone
diff --git a/setup.py b/setup.py
index 566d84432e..cd35c3c35b 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)