From 6a82e0401d700f8ad925bf3924225d00a0e90a81 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: Iba35cef6449b9c40a820114d59c1c45f56946b8d Signed-off-by: Doug Hellmann --- tox.ini | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index ca4b93a1..0d719f0b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ minversion = 2.0 envlist = py35,py27,pep8 [testenv] -basepython = python3 install_command = pip install {opts} {packages} deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} @@ -15,15 +14,18 @@ commands = python setup.py testr --slowest --testr-args='{posargs}' basepython = python2.7 [testenv:pep8] +basepython = python3 commands = flake8 # Run security linter bandit -r oslo_utils -x tests -n5 [testenv:venv] +basepython = python3 commands = {posargs} [testenv:docs] +basepython = python3 whitelist_externals = rm deps = -r{toxinidir}/doc/requirements.txt commands = @@ -31,9 +33,11 @@ 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_utils --testr-args='{posargs}' [testenv:bandit] +basepython = python3 commands = bandit -r oslo_utils -x tests -n5 [flake8] @@ -42,10 +46,12 @@ show-source = True exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py [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