Only install doc requirements if needed

We only need doc requirements for the doc jobs, so only install them
there.

Also, update docs job to not publish dirtrees.

Change-Id: I928f4e24970a680bf340ce15a08a4e72432fb0e4
This commit is contained in:
Andreas Jaeger 2019-09-13 10:09:59 +02:00
parent b29f5db9c7
commit f0dd0bd63a

View File

@ -8,7 +8,6 @@ usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps= deps=
-c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
-r{toxinidir}/doc/requirements.txt
-r{toxinidir}/requirements.txt -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
commands= commands=
@ -46,14 +45,16 @@ basepython = python3
commands = python setup.py test --coverage --coverage-package-name diskimage_builder --testr-args='{posargs}' commands = python setup.py test --coverage --coverage-package-name diskimage_builder --testr-args='{posargs}'
[testenv:docs] [testenv:docs]
deps= -r{toxinidir}/doc/requirements.txt
basepython = python3 basepython = python3
whitelist_externals = whitelist_externals =
rm rm
commands = commands =
rm -rf doc/build rm -rf doc/build
sphinx-build -W -b html doc/source doc/build/html {posargs} sphinx-build -W -b html -d doc/build/doctrees doc/source doc/build/html {posargs}
[testenv:releasenotes] [testenv:releasenotes]
deps = {[testenv:docs]deps}
basepython = python3 basepython = python3
commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html