From bc64c8fe436141b2a215527ac59823d016ddb827 Mon Sep 17 00:00:00 2001 From: Doug Hellmann <doug@doughellmann.com> Date: Wed, 6 Jun 2018 17:58:19 -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: If58f9473978c6dd66834cc10e86a1cefc5c34cd2 Signed-off-by: Doug Hellmann <doug@doughellmann.com> --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tox.ini b/tox.ini index cf6ea4ab..1f1d965e 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,7 @@ commands = whitelist_externals = find [testenv:pep8] +basepython = python3 commands = flake8 # Check that .po and .pot files are valid: @@ -25,6 +26,7 @@ commands = whitelist_externals = bash [testenv:venv] +basepython = python3 commands = {posargs} [testenv:functional] @@ -34,14 +36,17 @@ setenv = passenv = OS_* [testenv:cover] +basepython = python3 commands = python setup.py testr --coverage --testr-args='{posargs}' coverage report [testenv:debug] +basepython = python3 commands = oslo_debug_helper -t senlinclient/tests {posargs} [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 @@ -49,6 +54,7 @@ deps = commands = sphinx-build -W -b html doc/source doc/build/html [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