From 62e9787a2d8cad63fad3b4797c1b16d10f90e505 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 3 Feb 2020 20:21:27 +0100
Subject: [PATCH] Switch to sphinx-build and cleanup

Switch to using modern sphinx-build.
Remove obsolete install_command from tox.ini.
Remove cruft from setup.cfg.

Change-Id: I0f3e9d980c25545a0085d406bf4f45fc6d6f4fbd
---
 setup.cfg | 15 +++------------
 tox.ini   |  4 ++--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index af04645..88dd25e 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/sphinx-feature-classification/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -16,23 +17,13 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3 :: Only
+    Programming Language :: Python :: Implementation :: CPython
 
 [files]
 packages =
     sphinx_feature_classification
 
-[wheel]
-universal = 1
-
-[build_sphinx]
-all-files = 1
-warning-is-error = 1
-source-dir = doc/source
-build-dir = doc/build
-
-[upload_sphinx]
-upload-dir = doc/build/html
-
 [compile_catalog]
 directory = sphinx_feature_classification/locale
 domain = sphinx_feature_classification
diff --git a/tox.ini b/tox.ini
index d11a462..bec94e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ ignore_basepython_conflict = True
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
@@ -29,7 +28,8 @@ commands = {posargs}
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands =
+  sphinx-build -W --keep-going -b html -d doc/build/doctrees doc/source doc/build/html
 
 [testenv:releasenotes]
 commands =