Pin tox to be less than 4
The dev environment used by some docs developers uses an old version of tox, and does not support the whitelist_externals entry required by tox 4. The version of tox used by some other developers cannot support tox.ini that contains both allowlist_externals and whitelist_externals in the same file. The fix for now is to stay with whitelist_externals and tox<4 Signed-off-by: Ron Stone <ronald.stone@windriver.com> Change-Id: I23b9d9ac0be81c4a1e6d89ef8a3373edb0b62ff0
This commit is contained in:
parent
945e19aa98
commit
7b43c326bd
|
@ -1,5 +1,7 @@
|
|||
---
|
||||
- project:
|
||||
vars:
|
||||
ensure_tox_version: '<4'
|
||||
templates:
|
||||
- stx-api-ref-jobs
|
||||
check:
|
||||
|
|
15
tox.ini
15
tox.ini
|
@ -18,21 +18,18 @@ deps =
|
|||
commands =
|
||||
sphinx-build -a -E -W --keep-going -d doc/build/doctrees -t starlingx -t openstack -b html doc/source doc/build/html {posargs}
|
||||
bash htmlChecks.sh doc/build/html
|
||||
allowlist_externals = bash
|
||||
whitelist_externals = bash
|
||||
htmlChecks.sh
|
||||
whitelist_externals = {[testenv:docs]allowlist_externals}
|
||||
|
||||
[testenv:api-ref]
|
||||
deps = {[testenv:docs]deps}
|
||||
commands =
|
||||
rm -rf api-ref/build
|
||||
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
|
||||
allowlist_externals = rm
|
||||
whitelist_externals = {[testenv:api-ref]allowlist_externals}
|
||||
whitelist_externals = rm
|
||||
|
||||
[testenv:linters]
|
||||
allowlist_externals = bash
|
||||
whitelist_externals = {[testenv:linters]allowlist_externals}
|
||||
whitelist_externals = bash
|
||||
commands =
|
||||
bash -c "find {toxinidir} \
|
||||
\( -name .tox -prune \) \
|
||||
|
@ -50,16 +47,14 @@ passenv=PWD
|
|||
commands =
|
||||
bash -c "echo Running in {env:PWD}"
|
||||
bash new-topic.sh {env:PWD} {toxinidir}
|
||||
allowlist_externals = new-topic.sh
|
||||
whitelist_externals = new-topic.sh
|
||||
bash
|
||||
whitelist_externals = {[testenv:newfile]allowlist_externals}
|
||||
|
||||
[testenv:picks]
|
||||
commands =
|
||||
./pickCompare.sh
|
||||
allowlist_externals = pickCompare.sh
|
||||
whitelist_externals = pickCompare.sh
|
||||
bash
|
||||
whitelist_externals = {[testenv:picks]allowlist_externals}
|
||||
|
||||
|
||||
[testenv:linkcheck]
|
||||
|
|
Loading…
Reference in New Issue