summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Hellmann <doug@doughellmann.com>2017-11-30 14:41:27 -0500
committerSean McGinnis <sean.mcginnis@huawei.com>2017-12-29 12:04:19 -0600
commit07364d43a8014acd5185375eaf3f61bf533c7add (patch)
tree8de30ff959c9d91fcd58ee9ce7bd902c734af44e
parent2b9a08ce91684c6e51d5cfe0737627815c0c3150 (diff)
downloadstevedore-07364d43a8014acd5185375eaf3f61bf533c7add.tar.gz
move doc requirements to doc/requirements.txt
The documentation jobs now look for requirements in doc/requirements.txt and do not use tox for release notes. Move the dependency list from setup.cfg to the new file and update tox.ini so the developer experience is consistent with what the CI system does. Change-Id: I739c9eba21d1b9a680d6b0e9cc6a4cbaca56e543 Signed-off-by: Doug Hellmann <doug@doughellmann.com> (cherry picked from commit 3ffdb1f0ba05555686840065a4cae36b93de86b5)
-rw-r--r--doc/requirements.txt3
-rw-r--r--test-requirements.txt2
-rw-r--r--tox.ini5
3 files changed, 10 insertions, 0 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
new file mode 100644
index 0000000..ea4c643
--- /dev/null
+++ b/doc/requirements.txt
@@ -0,0 +1,3 @@
+openstackdocstheme>=1.17.0 # Apache-2.0
+reno>=2.5.0 # Apache-2.0
+sphinx>=1.6.2 # BSD
diff --git a/test-requirements.txt b/test-requirements.txt
index 560de35..90d0c0f 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,3 +9,5 @@ coverage!=4.4,>=4.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
openstackdocstheme>=1.16.0 # Apache-2.0
reno!=2.3.1,>=1.8.0 # Apache-2.0
+# sphinx is needed for testing the sphinxext module
+sphinx>=1.6.2 # BSD
diff --git a/tox.ini b/tox.ini
index 6ac29a8..36fbfe4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,9 @@ distribute = False
commands = python setup.py testr --testr-args='{posargs}'
[testenv:venv]
+deps =
+ -r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/doc/requirements.txt
commands = {posargs}
[testenv:pep8]
@@ -22,6 +25,7 @@ ignore = E251
commands = flake8 stevedore setup.py
[testenv:docs]
+deps = -r{toxinidir}/doc/requirements.txt
commands = python setup.py build_sphinx
[flake8]
@@ -30,4 +34,5 @@ show-source = True
exclude=.venv,.git,.tox,dist,*lib/python*,*egg,build
[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