summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-03 15:35:27 +0000
committerGerrit Code Review <review@openstack.org>2018-01-03 15:35:27 +0000
commite3e0bd0e7d57a7372df8d8ef3aef0280f463ae77 (patch)
treef9064e3e14fbd875d0308c207db682ba1cdc2c6a
parentff5c159b59852f81f02b317d0fdbb779196de384 (diff)
parent2ba0aa94a0024332b119e49274bcd027225141e5 (diff)
downloadoslo-utils-e3e0bd0e7d57a7372df8d8ef3aef0280f463ae77.tar.gz
Merge "Follow the new PTI for document build"
-rw-r--r--doc/requirements.txt5
-rw-r--r--test-requirements.txt6
-rw-r--r--tox.ini4
3 files changed, 8 insertions, 7 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..26ef9b9
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,5 @@
+# this is required for the docs build jobs
+sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.17.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index df193c2..6e4389a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,10 +16,6 @@ ddt>=1.0.1 # MIT
# deps = {[testenv]deps} coverage
coverage!=4.4,>=4.0 # Apache-2.0
-# this is required for the docs build jobs
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
-
# mocking framework
mock>=2.0.0 # BSD
@@ -28,5 +24,3 @@ oslo.config>=5.1.0 # Apache-2.0
# Bandit security code scanner
bandit>=1.1.0 # Apache-2.0
-
-reno>=2.5.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 5044eb1..ed1dd2c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,7 +20,8 @@ commands =
commands = {posargs}
[testenv:docs]
-commands = python setup.py build_sphinx
+deps = -r{toxinidir}/doc/requirements.txt
+commands = sphinx-build -b html doc/source doc/build/html
[testenv:cover]
commands = python setup.py test --coverage --coverage-package-name=oslo_utils --testr-args='{posargs}'
@@ -42,4 +43,5 @@ deps = pip_missing_reqs
commands = pip-missing-reqs -d --ignore-module=oslo_utils* --ignore-module=pkg_resources --ignore-file=oslo_utils/test.py --ignore-file=oslo_utils/tests/* oslo_utils
[testenv:releasenotes]
+deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html