Merge "fix tox python3 overrides"

This commit is contained in:
Zuul 2018-07-11 20:13:19 +00:00 committed by Gerrit Code Review
commit 63fd37eb5e

View File

@ -28,6 +28,7 @@ setenv =
[testenv:docs] [testenv:docs]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands= commands=
bash -c "rm -rf doc/build" bash -c "rm -rf doc/build"
@ -41,6 +42,7 @@ extensions = .rst
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = commands =
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
@ -48,11 +50,13 @@ commands =
# environment used by the -infra templated docs job # environment used by the -infra templated docs job
[testenv:venv] [testenv:venv]
basepython = python3
commands = commands =
{posargs} {posargs}
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
bash -c "{toxinidir}/tests/common/test-pep8.sh" bash -c "{toxinidir}/tests/common/test-pep8.sh"
@ -65,16 +69,19 @@ ignore=F403
[testenv:bashate] [testenv:bashate]
basepython = python3
commands = commands =
bash -c "{toxinidir}/tests/common/test-bashate.sh" bash -c "{toxinidir}/tests/common/test-bashate.sh"
[testenv:ansible-syntax] [testenv:ansible-syntax]
basepython = python3
commands = commands =
bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh" bash -c "{toxinidir}/tests/common/test-ansible-syntax.sh"
[testenv:ansible-lint] [testenv:ansible-lint]
basepython = python3
commands = commands =
bash -c "{toxinidir}/tests/common/test-ansible-lint.sh" bash -c "{toxinidir}/tests/common/test-ansible-lint.sh"
@ -85,6 +92,7 @@ commands =
[testenv:linters] [testenv:linters]
basepython = python3
commands = commands =
bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
{[testenv:pep8]commands} {[testenv:pep8]commands}