From e26e00897ecbe472b7c600e4bdad5f0245926ba5 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 19 Apr 2020 09:48:30 +0200
Subject: [PATCH] Update docs building

Update docs building:
* Switch to sphinx-build
* Update requirements for Sphinx and openstackdocstheme for
  python 3
* Remove unneeded doc and translation sections from setup.cfg
* Remove install_command, it's unneeded, the default is fine.

Change-Id: I5678058e43df7e708c7aefd7c06431ab21415e34
---
 setup.cfg             | 23 -----------------------
 test-requirements.txt |  4 ++--
 tox.ini               |  7 ++++---
 3 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/setup.cfg b/setup.cfg
index b8d88a1..36ee8b8 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -26,26 +26,3 @@ packages =
 [entry_points]
 tempest.test_plugins =
     monasca_tests = monasca_tempest_tests.plugin:MonascaTempestPlugin
-
-[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 = monasca_tempest_tests/locale
-domain = monasca_tempest_tests
-
-[update_catalog]
-domain = monasca_tempest_tests
-output_dir = monasca_tempest_tests/locale
-input_file = monasca_tempest_tests/locale/monasca_tempest_plugin.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = monasca_tempest_tests/locale/monasca_tempest_plugin.pot
diff --git a/test-requirements.txt b/test-requirements.txt
index 1b760eb..72d3d0d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,7 @@
 
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
-openstackdocstheme>=1.20.0 # Apache-2.0
+sphinx>=2.0.0,!=2.1.0 # BSD
+openstackdocstheme>=2.0.0 # Apache-2.0
 # releasenotes
 reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index fe448a8..f930ee4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,14 +7,15 @@ 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}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
    OS_STDOUT_CAPTURE=1
    OS_STDERR_CAPTURE=1
    OS_TEST_TIMEOUT=60
-deps = -r{toxinidir}/test-requirements.txt
+deps =
+  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -r{toxinidir}/test-requirements.txt
 commands = stestr run {posargs}
 
 [testenv:pep8]
@@ -34,7 +35,7 @@ commands =
     coverage xml -o cover/coverage.xml
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
 commands =