From 34039db3b84bf145f789ada8cfcb70b41818c825 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 7 Apr 2020 18:37:57 +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
- Use sphinx-build in tox.ini

Change-Id: I60125ddd4c2a2b2976ca1af156a2c3ab09d8bf34
---
 setup.cfg | 11 +++--------
 setup.py  |  9 ---------
 tox.ini   |  3 ++-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index 50fda25..50ef72a 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/trove/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
@@ -20,11 +23,3 @@ classifier =
 [files]
 packages =
     trove_dashboard
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
diff --git a/setup.py b/setup.py
index 782bb21..0cdc8c2 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>=1.8'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index 7e447b2..f289db5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,8 @@ commands = /bin/bash run_tests.sh -N --integration --selenium-headless {posargs}
 commands = python setup.py testr --coverage --testr-args={posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -a -E -W -b html doc/source doc/build/html
 
 [testenv:debug]
 commands = oslo_debug_helper {posargs}