Add doc/requirements.txt file with doc requirements

The sphinx jobs need to find doc requirements in either
test-requiremnts.txt or doc/requirements.txt. Putting them directly in
to tox.ini, not so much.

Amended to use matching stable/ocata requirements.

Change-Id: I98a43b511a6949fa4f00c26eec224d24d6fa6588
(cherry picked from commit 4187d2fc4a)
This commit is contained in:
Monty Taylor 2017-12-18 11:11:03 -06:00 committed by Jens Harbott
parent af3c43f1f6
commit 8ab40f4652
2 changed files with 12 additions and 17 deletions

10
doc/requirements.txt Normal file
View File

@ -0,0 +1,10 @@
pbr>=0.6,!=0.7,<1.0
Pygments
docutils
sphinx>=1.1.2,<1.2
oslosphinx
nwdiag
blockdiag
sphinxcontrib-blockdiag
sphinxcontrib-nwdiag

19
tox.ini
View File

@ -34,16 +34,7 @@ commands = bash -c "find {toxinidir} \
-print0 | xargs -0 bashate -v -iE006 -eE005,E042"
[testenv:docs]
deps =
Pygments
docutils
sphinx>=1.1.2,<1.2
pbr>=0.6,!=0.7,<1.0
oslosphinx
nwdiag
blockdiag
sphinxcontrib-blockdiag
sphinxcontrib-nwdiag
deps = -r{toxinidir}/doc/requirements.txt
whitelist_externals = bash
setenv =
TOP_DIR={toxinidir}
@ -51,11 +42,5 @@ commands =
python setup.py build_sphinx
[testenv:venv]
deps =
pbr>=0.6,!=0.7,<1.0
sphinx>=1.1.2,<1.2
oslosphinx
blockdiag
sphinxcontrib-blockdiag
sphinxcontrib-nwdiag
deps = -r{toxinidir}/doc/requirements.txt
commands = {posargs}