Merge "Update min version of tox to use allowlist"

This commit is contained in:
Zuul 2021-05-25 11:44:27 +00:00 committed by Gerrit Code Review
commit 5be2172f06

View File

@ -1,5 +1,5 @@
[tox] [tox]
minversion = 3.9.0 minversion = 3.18.0
skipsdist = True skipsdist = True
envlist = py3,pep8 envlist = py3,pep8
ignore_basepython_conflict=true ignore_basepython_conflict=true
@ -39,7 +39,7 @@ deps=
flake8-import-order>=0.17.1 # LGPLv3 flake8-import-order>=0.17.1 # LGPLv3
Pygments>=2.2.0 # BSD Pygments>=2.2.0 # BSD
bashate>=0.5.1 # Apache-2.0 bashate>=0.5.1 # Apache-2.0
whitelist_externals = bash allowlist_externals = bash
commands = commands =
bash tools/flake8wrap.sh {posargs} bash tools/flake8wrap.sh {posargs}
# Run bashate during pep8 runs to ensure violations are caught by # Run bashate during pep8 runs to ensure violations are caught by
@ -85,7 +85,7 @@ deps =
commands = sphinx-build -b html -W doc/source doc/build/html commands = sphinx-build -b html -W doc/source doc/build/html
[testenv:pdf-docs] [testenv:pdf-docs]
whitelist_externals = make allowlist_externals = make
deps = {[testenv:docs]deps} deps = {[testenv:docs]deps}
commands = commands =
sphinx-build -W -b latex doc/source doc/build/pdf sphinx-build -W -b latex doc/source doc/build/pdf
@ -97,7 +97,7 @@ usedevelop = False
deps = deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
-r{toxinidir}/doc/requirements.txt -r{toxinidir}/doc/requirements.txt
whitelist_externals = bash allowlist_externals = bash
commands = commands =
bash -c 'rm -rf api-ref/build' bash -c 'rm -rf api-ref/build'
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html