From 163c8346a3ff0499c40b69e3aa4ebad0569955ad Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 27 Mar 2020 16:45:21 +0100
Subject: [PATCH] Cleanup Python 2.7 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 section from setup.cfg: Wheel is not needed for python
  3 only repo
- Update requirements, no need for python_version anymore

Change-Id: Ib2221fc13cd53c93150e838418e7e110e087d1b3
---
 doc/requirements.txt | 2 +-
 setup.cfg            | 5 ++---
 setup.py             | 8 --------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/doc/requirements.txt b/doc/requirements.txt
index 581659954b..28e33b7752 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -2,7 +2,7 @@ mock>=3.0.0 # BSD
 openstackdocstheme>=1.31.2 # Apache-2.0
 os-api-ref>=1.4.0 # Apache-2.0
 reno>=2.5.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
 sphinxcontrib-apidoc>=0.2.0  # BSD
 sphinxcontrib-pecanwsme>=0.10.0 # Apache-2.0
 sphinxcontrib-seqdiag>=0.8.4 # BSD
diff --git a/setup.cfg b/setup.cfg
index 5dd3dc4fe9..5b4c0f25ea 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/ironic/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -13,6 +14,7 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
@@ -194,9 +196,6 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = ironic/locale/ironic.pot
 
-[wheel]
-universal = 1
-
 [extras]
 guru_meditation_reports =
   oslo.reports>=1.18.0 # Apache-2.0
diff --git a/setup.py b/setup.py
index 566d84432e..f63cc23c52 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)