From eb12edabc6b47a4876a27e39451b23949727ea83 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 26 Sep 2018 18:42:47 -0400 Subject: [PATCH] fix tox python3 overrides We want to default to running all tox environments under python 3, so set the basepython value in each environment. We do not want to specify a minor version number, because we do not want to have to update the file every time we upgrade python. We do not want to set the override once in testenv, because that breaks the more specific versions used in default environments like py35 and py36. Change-Id: Ia15dfc6f5ec8b96acc19ffd8e20a3405703a9864 Signed-off-by: Doug Hellmann --- tox.ini | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tox.ini b/tox.ini index 2775322..490fab3 100644 --- a/tox.ini +++ b/tox.ini @@ -33,6 +33,7 @@ setenv = [testenv:docs] +basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands= bash -c "rm -rf doc/build" @@ -46,6 +47,7 @@ extensions = .rst [testenv:releasenotes] +basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html @@ -53,11 +55,13 @@ commands = # environment used by the -infra templated docs job [testenv:venv] +basepython = python3 commands = {posargs} [testenv:pep8] +basepython = python3 commands = bash -c "{toxinidir}/tests/common/test-pep8.sh" @@ -98,6 +102,7 @@ commands = [testenv:linters] +basepython = python3 commands = bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" {[testenv:pep8]commands}