From 573fde0ff964003006a6445edf774812ee09c496 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 Jun 2018 15:27:00 -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: Ife7b0078c67df55b4b5d5b3d27f4228907a5531b Signed-off-by: Doug Hellmann --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tox.ini b/tox.ini index 1814832d..733351c7 100644 --- a/tox.ini +++ b/tox.ini @@ -14,12 +14,15 @@ passenv = OS_TEST_* commands = ostestr --slowest {posargs} [testenv:docs] +basepython = python3 commands = python setup.py build_sphinx [testenv:releasenotes] +basepython = python3 commands = sphinx-build -a -E -W -d releasenotes/build/.doctrees -b html releasenotes/source releasenotes/build/html [testenv:pep8] +basepython = python3 commands = flake8 {posargs} # Run security linter @@ -31,6 +34,7 @@ commands = doc8 {posargs} [testenv:bandit] +basepython = python3 # NOTE(browne): This is required for the integration test job of the bandit # project. Please do not remove. # The following bandit tests are being skipped: @@ -40,10 +44,12 @@ commands = commands = bandit -r glance_store -x tests --skip B101,B110,B303 [testenv:cover] +basepython = python3 setenv = VIRTUAL_ENV={envdir} commands = python setup.py testr --coverage --testr-args='^(?!.*test.*coverage).*$' [testenv:venv] +basepython = python3 commands = {posargs} # See glance_store/tests/functional/README.rst for information on writing or