From 8f3213f8c6140e22995a33effca08213318a5a29 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 Jun 2018 14:50:07 -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: I1a478fc7568d350e77773edbf7ac3b4c3e50cff2 Signed-off-by: Doug Hellmann --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 1066c3d5..1b054d98 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ minversion = 2.0 envlist = py35,py27,pep8 [testenv] -basepython = python3 setenv = VIRTUAL_ENV={envdir} BRANCH_NAME=master @@ -17,6 +16,7 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' basepython = python2.7 [testenv:pep8] +basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = @@ -25,13 +25,16 @@ commands = bandit -r oslo_versionedobjects tests -n5 --skip B303 [testenv:venv] +basepython = python3 commands = {posargs} [testenv:docs] +basepython = python3 deps = -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html [testenv:cover] +basepython = python3 commands = python setup.py test --coverage --coverage-package-name=oslo_versionedobjects --testr-args='{posargs}' [flake8] @@ -46,10 +49,12 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build import_exceptions = oslo_versionedobjects._i18n [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 [testenv:lower-constraints] +basepython = python3 deps = -c{toxinidir}/lower-constraints.txt -r{toxinidir}/test-requirements.txt