From 5b6333a5e3f145e7d572e126531da546257cccd2 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 10 Apr 2020 11:04:44 +0200
Subject: [PATCH] Cleanup py27 support

Make a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine
- Cleanup tox.ini, the repo is now python3 only

Change-Id: Ia24cc501831202cb4d710a9a5e9b2fdb8bef070d
---
 requirements.txt |  2 +-
 setup.cfg        | 10 ----------
 setup.py         |  9 ---------
 tox.ini          |  7 +------
 4 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 93ecbfd..c67eaf9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 # 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.17.0 # Apache-2.0
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
+openstackdocstheme>=1.32.1 # Apache-2.0
 sphinx>=1.6.2 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
diff --git a/setup.cfg b/setup.cfg
index f687e5a..bfe18ef 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,13 +11,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-builders = html
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[wheel]
-universal = 1
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)
diff --git a/tox.ini b/tox.ini
index 0d56e9d..d5e4262 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,35 +4,30 @@ envlist = docs,pep8
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:venv]
-basepython = python3
 commands = {posargs}
 
 [testenv:docs]
-basepython = python3
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pep8]
-basepython = python3
 description = Runs set of linters against codebase (checkniceness)
 commands = {[testenv:checkniceness]commands}
 
 [testenv:checkniceness]
-basepython = python3
 description = Validates (pep-like) documenation
 skip_install = True
 usedevelop = False
 commands = doc8 --file-encoding utf-8 {toxinidir}/doc
 
 [testenv:spelling]
-basepython = python3
 deps =
    -r{toxinidir}/requirements.txt
    sphinxcontrib-spelling