From 6053cba01af3b1a470d729eb0d60a167bf51f029 Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Sun, 3 May 2020 11:42:17 +0200
Subject: [PATCH] Update docs building

Update docs building:
* Switch to sphinx-build
* Update requirements for Sphinx and openstackdocstheme for
  python 3, create doc/requiremetns
* Remove unneeded doc and translation sections from setup.cfg
* Remove install_command, it's unneeded, the default is fine.
* Move constraints to deps, use TOX_CONSTRAINTS instead of obsolete
  UPPER_CONSTRAINTS
* Remove now unneeded placeholder file

Change-Id: I649e6fa86c17262698cc8a01d042a87b020239d9
---
 doc/requirements.txt            |  5 +++++
 releasenotes/notes/.placeholder |  0
 setup.cfg                       | 14 --------------
 test-requirements.txt           |  4 ----
 tox.ini                         | 10 ++++++----
 5 files changed, 11 insertions(+), 22 deletions(-)
 create mode 100644 doc/requirements.txt
 delete mode 100644 releasenotes/notes/.placeholder

diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..b5a07c4
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+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/releasenotes/notes/.placeholder b/releasenotes/notes/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/setup.cfg b/setup.cfg
index 9f5a2a2..660ae5a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,20 +24,6 @@ classifier =
 packages =
     murano_tempest_tests
 
-[compile_catalog]
-directory = murano_tempest_tests/locale
-domain = murano_tempest_tests
-
-[update_catalog]
-domain = murano_tempest_tests
-output_dir = murano_tempest_tests/locale
-input_file = murano_tempest_tests/locale/murano_tempest_tests.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = murano_tempest_tests/locale/murano_tempest_tests.pot
-
 [entry_points]
 tempest.test_plugins =
     murano_tests = murano_tempest_tests.plugin:MuranoTempestPlugin
diff --git a/test-requirements.txt b/test-requirements.txt
index ee5b8b4..697ac69 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,10 +6,6 @@ hacking>=3.0,<3.1.0;python_version>='3.5' # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2  # BSD
 oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-openstackdocstheme>=1.18.1 # Apache-2.0
-# releasenotes
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 349fa3a..abe1369 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,17 @@
 [tox]
 minversion = 3.1.1
-envlist = py35,py27,pypy,pep8
+envlist = py36,pypy,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
 basepython = python3
 usedevelop = True
-install_command = pip install {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps = -r{toxinidir}/test-requirements.txt
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+       -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
 commands = python setup.py test --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
@@ -25,9 +24,12 @@ commands = {posargs}
 commands = python setup.py test --coverage --testr-args='{posargs}'
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+       -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:releasenotes]
+deps = {[testenv:docs]deps}
 commands =
   sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html