From f0ae3e5b074c8f757793c375d8609dbcbd8faa29 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 7 Apr 2020 13:48:15 +0200
Subject: [PATCH] Cleanup py27 support

Make a few cleanups:
- Remove obsolete sections from setup.cfg
- Update requirements, no need for python_version anymore
- Switch to sphinx-build

Change-Id: Iaee99ab7ebbb7d866ef50b901e160be77538e566
---
 requirements.txt |  2 +-
 setup.cfg        | 12 ------------
 tox.ini          |  3 +--
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7acf764..5131bff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 pbr>=2.0.0,!=2.1.0 # Apache-2.0
-sphinx>=1.8.0,!=2.1.0;python_version>='3.4' # BSD
+sphinx>=1.8.0,!=2.1.0 # BSD
 testtools>=1.4.0
 yasfb>=0.8.0
 openstackdocstheme>=1.19.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 69ddd73..9444443 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,15 +10,3 @@ classifier =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
-[pbr]
-warnerrors = False
-
-[wheel]
-universal = 1
diff --git a/tox.ini b/tox.ini
index c18931a..c276d67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,6 @@ ignore_basepython_conflict = True
 basepython=python3
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
-install_command = pip install {opts} {packages}
 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
        -r{toxinidir}/test-requirements.txt
 whitelist_externals = find
@@ -26,7 +25,7 @@ deps =
 setenv = PYTHONHASHSEED=0
 commands =
   find . -type f -name "*.pyc" -delete
-  python setup.py build_sphinx
+  sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 envdir = {toxworkdir}/docs