Move doc related modules to doc/requirements.txt

Change-Id: Ice407c712b5438b06c4f439c73946640a0c5a86d

4 files changed, 20 insertions, 7 deletions

diff --git a/.gitignore b/.gitignore
index ad4b0eb..d3b8ec1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,8 @@ openstack/versioninfo
 openstack/common/db/*.sqlite
 .stestr/
 etc/openstack.conf.sample
+
+# reno build
 releasenotes/build
+releasenotes/notes/reno.cache
+RELEASENOTES.rst
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..2d290be
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+
+sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 2801fae..d4fab97 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,10 +4,6 @@
 hacking>=1.1.0,<1.2.0 # Apache-2.0
 stestr>=2.0.0 # Apache-2.0
 
-sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.5;python_version>='3.4' # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
-
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
@@ -16,7 +12,5 @@ testscenarios>=0.4 # Apache-2.0/BSD
 # for pre-release tests
 oslo.config>=5.2.0 # Apache-2.0
 
-reno>=2.5.0 # Apache-2.0
-
 # Bandit security code scanner
 bandit>=1.1.0,<1.6.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5f4b944..1baf8e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -28,7 +28,14 @@ commands = {posargs}
 
 [testenv:docs]
 basepython = python3
-commands = python setup.py build_sphinx
+whitelist_externals =
+  rm
+deps =
+  {[testenv]deps}
+  -r{toxinidir}/doc/requirements.txt
+commands =
+  rm -rf doc/build
+  sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:cover]
 basepython = python3