From 59d867d409dc02b0d2e705c802ab2049f567bcc1 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 4 Apr 2020 17:02:59 +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:
  * Wheel is not needed for python 3 only repo
  * Some other sections are obsolete
- Update classifiers
- Update requirements, no need for python_version anymore

Change-Id: I49f919ee7d8a23d4958328966a2b633a12bb7525
---
 doc/requirements.txt |  2 +-
 setup.cfg            | 10 +++-------
 setup.py             |  9 ---------
 3 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 06e19f99..db8055d6 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,5 +2,5 @@
 # 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.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
 reno>=2.5.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 3dc6cdf4..0b151fb3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,6 +7,7 @@ license = Apache License, Version 2.0
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
 home-page = https://docs.openstack.org/python-muranoclient/latest/
+python-requires = >=3.6
 classifier =
     Development Status :: 4 - Beta
     Environment :: Console
@@ -17,6 +18,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
@@ -64,18 +67,11 @@ openstack.application_catalog.v1 =
     static-action_call = muranoclient.osc.v1.action:StaticActionCall
     class-schema = muranoclient.osc.v1.schema:ShowSchema
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [egg_info]
 tag_build =
 tag_date = 0
 tag_svn_revision = 0
 
-[wheel]
-universal = 1
-
 [compile_catalog]
 directory = muranoclient/locale
 domain = muranoclient
diff --git a/setup.py b/setup.py
index 566d8443..cd35c3c3 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)