From e2536fa3fafde7eb2ad00a715efca40ddc64fb90 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 Jun 2018 16:06:05 -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: I82c3b74bb0346fa1742a97c00f2b5f3fb26263e9 Signed-off-by: Doug Hellmann --- tox.ini | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tox.ini b/tox.ini index 051669003..f69209d38 100644 --- a/tox.ini +++ b/tox.ini @@ -20,23 +20,29 @@ commands = passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:pep8] +basepython = python3 commands = flake8 [testenv:genconfig] +basepython = python3 commands = oslo-config-generator --config-file=etc/vitrage/vitrage-config-generator.conf [testenv:genpolicy] +basepython = python3 commands = oslopolicy-sample-generator --config-file=etc/vitrage/vitrage-policy-generator.conf [testenv:venv] +basepython = python3 commands = {posargs} [testenv:cover] +basepython = python3 commands = python setup.py testr --coverage --testr-args='{posargs}' coverage report [testenv:docs] +basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/requirements.txt @@ -44,6 +50,7 @@ deps = commands = sphinx-build -W -b html doc/source doc/build/html [testenv:debug] +basepython = python3 commands = oslo_debug_helper {posargs} [flake8] @@ -63,6 +70,7 @@ local-check-factory = vitrage.hacking.checks.factory import_exceptions = vitrage.i18n [testenv:releasenotes] +basepython = python3 deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/requirements.txt