From 4c762573ece8412c1e1ff5fb92d2c7c34a3b33ba Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sat, 25 Apr 2020 15:57:07 +0200
Subject: [PATCH] Cleanup py27 support

This repo is now testing only with Python 3, so let's make
a few cleanups:
- Remove python 2.7 stanza from setup.py
- Remove obsolete sections from setup.cfg
- Cleanup */source/conf.py to remove now obsolete content.
- Remove install_command from tox.ini, the default is fine

Change-Id: I4b40d9570a2214f245d439693daecced49f97dc5
---
 doc/source/conf.py          | 22 ----------------------
 releasenotes/source/conf.py |  9 ---------
 setup.cfg                   | 11 -----------
 setup.py                    |  9 ---------
 tox.ini                     | 10 +++++-----
 5 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index 5321ef1..11f3612 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -22,8 +22,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import pbr.version
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -67,22 +65,6 @@ role_name = 'systemd_networkd'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Documentation: ' + role_name + ' role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version_info = pbr.version.VersionInfo(target_name)
-# The full version, including alpha/beta/rc tags.
-release = version_info.version_string_with_vcs()
-# The short X.Y version.
-version = version_info.canonical_version_string()
-
 # openstackdocstheme options
 repository_name = 'openstack/' + target_name
 bug_project = project.lower()
@@ -173,10 +155,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 191a907..b544cc9 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -62,11 +62,6 @@ role_name = 'systemd_networkd'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
 # Release notes do not need a version number in the title,
 # they cover multiple versions.
 # The full version, including alpha/beta/rc tags.
@@ -158,10 +153,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
diff --git a/setup.cfg b/setup.cfg
index d3dd10f..b51f92b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,14 +11,3 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
-
-[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 4dc27d3..65eb28f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,6 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command =
-    pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 commands =
     /usr/bin/find . -type f -name "*.pyc" -delete
 passenv =
@@ -35,11 +33,13 @@ setenv =
 
 
 [testenv:docs]
-deps = -r{toxinidir}/doc/requirements.txt
+deps =
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+ -r{toxinidir}/doc/requirements.txt
 commands =
     bash -c "rm -rf doc/build"
     doc8 doc
-    sphinx-build -b html doc/source doc/build/html
+    sphinx-build -W -b html doc/source doc/build/html
 
 
 [testenv:pdf-docs]
@@ -57,7 +57,7 @@ extensions = .rst
 
 
 [testenv:releasenotes]
-deps = -r{toxinidir}/doc/requirements.txt
+deps = {[testenv:docs]deps}
 commands =
     sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html