From e4162c215b74a7fb15c9636f43edfa842787fef4 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 10 Apr 2020 15:34:49 +0200
Subject: [PATCH] Cleanup py27 support

Make a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Update classifiers
- Switch to using sphinx-build
- Cleanup doc/source/conf.py to remove now obsolete content.
- Use newer openstackdocstheme version
- Remove install_command from tox.ini, the default is fine

Change-Id: I40cf60b58847cee619bcac0a60c760bebd001954
---
 doc/source/conf.py    |  5 -----
 requirements.txt      |  1 -
 setup.cfg             | 25 ++-----------------------
 setup.py              |  9 ---------
 test-requirements.txt |  2 +-
 tox.ini               |  3 +--
 6 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index fc516c4..3c39592 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -75,11 +75,6 @@ html_theme = 'openstackdocs'
 # Output file base name for HTML help builder.
 htmlhelp_basename = '%sdoc' % project
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
diff --git a/requirements.txt b/requirements.txt
index 7acf1b0..6de9f4e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,4 +3,3 @@
 # process, which may cause wedges in the gate later.
 
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-Babel!=2.4.0,>=2.3.4 # BSD
diff --git a/setup.cfg b/setup.cfg
index 5e8d3ba..a30a2ea 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,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.5
     Programming Language :: Python :: 3.6
@@ -26,26 +28,3 @@ packages =
 [entry_points]
 console_scripts =
     bashate = bashate.bashate:main
-
-[build_sphinx]
-source-dir = doc/source
-build-dir = doc/build
-all_files = 1
-warning-is-error = 1
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
-[compile_catalog]
-directory = bashate/locale
-domain = bashate
-
-[update_catalog]
-domain = bashate
-output_dir = bashate/locale
-input_file = bashate/locale/bashate.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = bashate/locale/bashate.pot
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/test-requirements.txt b/test-requirements.txt
index 55a5708..1d90dcd 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ discover
 fixtures>=1.3.1
 python-subunit>=0.0.18
 sphinx!=1.6.6,!=1.6.7,!=2.1.0  # BSD
-openstackdocstheme>=1.11.0 # Apache-2.0
+openstackdocstheme>=1.31.2 # Apache-2.0
 testtools>=2.2.0
 stestr>=1.0.0 # Apache-2.0
 reno!=2.3.1,>=1.8.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 32efad1..09367c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,6 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 whitelist_externals = *
@@ -20,7 +19,7 @@ commands =
 commands = flake8
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -a -W -E -b html doc/source doc/build/html
 
 [testenv:venv]
 commands = {posargs}