diff options
| author | Doug Hellmann <doug@doughellmann.com> | 2017-11-30 14:41:27 -0500 |
|---|---|---|
| committer | Doug Hellmann <doug@doughellmann.com> | 2017-11-30 17:46:59 -0500 |
| commit | 3ffdb1f0ba05555686840065a4cae36b93de86b5 (patch) | |
| tree | 0ddbe58ca8e7d8c284c3f0e2cced3a7b4bf2c4a3 | |
| parent | 6720cf7ed0b031e9e37c0f268a5a485688fe66ec (diff) | |
| download | stevedore-3ffdb1f0ba05555686840065a4cae36b93de86b5.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>
| -rw-r--r-- | doc/requirements.txt | 3 | ||||
| -rw-r--r-- | setup.cfg | 5 | ||||
| -rw-r--r-- | test-requirements.txt | 3 | ||||
| -rw-r--r-- | tox.ini | 6 |
4 files changed, 10 insertions, 7 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 @@ -16,11 +16,6 @@ classifier = Intended Audience :: Developers Environment :: Console -[extras] -docs = - openstackdocstheme>=1.17.0 # Apache-2.0 - reno>=2.5.0 # Apache-2.0 - [global] setup-hooks = pbr.hooks.setup_hook diff --git a/test-requirements.txt b/test-requirements.txt index 2118422..699eeaf 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -sphinx>=1.6.2 # BSD mock>=2.0.0 # BSD coverage!=4.4,>=4.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD +# sphinx is needed for testing the sphinxext module +sphinx>=1.6.2 # BSD @@ -10,11 +10,13 @@ setenv = install_command = {toxinidir}/tools/tox_install.sh {env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} deps = -r{toxinidir}/test-requirements.txt - .[docs] 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] @@ -23,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] @@ -31,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 |