From 6e90d28b9b0d46fa2491557be8f5141f0e155297 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Wed, 6 Jun 2018 14:50:06 -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: I16855b85149c1e0dc98f12e6380a1d20b857590f Signed-off-by: Doug Hellmann --- tox.ini | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 16f3bd4..a9b9a70 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} install_command = pip install {opts} {packages} @@ -16,19 +15,23 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' basepython = python2.7 [testenv:pep8] +basepython = python3 commands = flake8 # Run security linter bandit -r oslo_middleware -x tests -n5 [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_middleware --testr-args='{posargs}' [flake8] @@ -42,10 +45,12 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py import_exceptions = oslo_middleware._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