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. Changes in cherry-pick due to different versions used in ocata. Change-Id: I739c9eba21d1b9a680d6b0e9cc6a4cbaca56e543 Signed-off-by: Doug Hellmann <doug@doughellmann.com> (cherry picked from commit3ffdb1f0ba
) (cherry picked from commit07364d43a8
)
This commit is contained in:
parent
72e7df283f
commit
aad3b135fb
|
@ -1,2 +1,3 @@
|
|||
Pillow==2.4.0 # MIT
|
||||
sphinx>=1.1.2,<1.2
|
||||
oslosphinx>=4.7.0 # Apache-2.0
|
||||
reno>=1.8.0 # Apache-2.0
|
||||
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
|
||||
|
|
|
@ -3,10 +3,10 @@
|
|||
# process, which may cause wedges in the gate later.
|
||||
|
||||
Pillow>=2.4.0 # PIL License
|
||||
# sphinx is needed for testing the sphinxext module
|
||||
sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
|
||||
mock>=2.0 # BSD
|
||||
coverage>=4.0 # Apache-2.0
|
||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
oslotest>=1.10.0 # Apache-2.0
|
||||
oslosphinx>=4.7.0 # Apache-2.0
|
||||
reno>=1.8.0 # Apache-2.0
|
||||
|
|
5
tox.ini
5
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
|
||||
|
|
Loading…
Reference in New Issue