From 805d94e9853e43e3d9f35e0ede2f9ddaea26bc69 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Fri, 17 Apr 2020 16:27:10 +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
- 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
- Update requirements, no need for python_version anymore
- Cleanup */source/conf.py to remove now obsolete content.
- Use newer openstackdocstheme, reno, Sphinx, hacking versions
  for python3
- Add pytest as requirement, horizon does not provide this anymore and
  the tests here call horizon files that need it.

Change-Id: I5983a19cadb210d55c30107fb963cfeaae0f1ee9
---
 doc/source/conf.py          |  5 -----
 releasenotes/source/conf.py |  9 +--------
 setup.cfg                   | 13 +++----------
 setup.py                    |  9 ---------
 test-requirements.txt       |  9 +++++----
 5 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/doc/source/conf.py b/doc/source/conf.py
index cdb60fe..549d29e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -60,11 +60,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'
-
 # Disable usage of xindy https://bugzilla.redhat.com/show_bug.cgi?id=1643664
 latex_use_xindy = False
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 52601a3..012a4a5 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -21,7 +21,6 @@ sys.path.insert(0, os.path.abspath('../..'))
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
-    'sphinx.ext.autodoc',
     # 'sphinx.ext.intersphinx',
     'reno.sphinxext',
     'openstackdocstheme',
@@ -61,11 +60,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]).
@@ -84,5 +78,4 @@ locale_dirs = ['locale/']
 
 # -- Options for openstackdocstheme -------------------------------------------
 repository_name = 'openstack/vitrage-dashboard'
-bug_project = 'vitrage-dashboard'
-bug_tag = ''
+use_storyboard = True
diff --git a/setup.cfg b/setup.cfg
index 39372ee..9745a4f 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/vitrage-dashboard/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
@@ -21,16 +24,6 @@ classifier =
 packages =
     vitrage_dashboard
 
-
-[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 = vitrage_dashboard/locale
 domain = vitrage-dashboard
diff --git a/setup.py b/setup.py
index 056c16c..f76858d 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'],
     pbr=True)
diff --git a/test-requirements.txt b/test-requirements.txt
index 0d94c0f..08515d0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,17 +2,18 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=1.1.0 # Apache-2.0
+hacking>=3.0.0 # Apache-2.0
 
 coverage>=3.6
 python-subunit>=0.0.18
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=2.1.0,>=2.0.0  # BSD
 nodeenv>=0.9.4 # BSD
-openstackdocstheme>=1.24.0 # Apache-2.0
+openstackdocstheme>=2.0.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=1.4.0
-reno>=1.8.0 # Apache-2.0
+pytest>=5.3.5 # MIT
+reno>=2.5.0 # Apache-2.0
 
 # integration tests requirements
 selenium>=2.50.1 # Apache-2.0