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 <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann 2018-06-06 14:50:06 -04:00
parent 0fb1b0aabe
commit 6a82e0401d

View File

@ -3,7 +3,6 @@ minversion = 2.0
envlist = py35,py27,pep8 envlist = py35,py27,pep8
[testenv] [testenv]
basepython = python3
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps = deps =
-c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -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 basepython = python2.7
[testenv:pep8] [testenv:pep8]
basepython = python3
commands = commands =
flake8 flake8
# Run security linter # Run security linter
bandit -r oslo_utils -x tests -n5 bandit -r oslo_utils -x tests -n5
[testenv:venv] [testenv:venv]
basepython = python3
commands = {posargs} commands = {posargs}
[testenv:docs] [testenv:docs]
basepython = python3
whitelist_externals = rm whitelist_externals = rm
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = commands =
@ -31,9 +33,11 @@ commands =
sphinx-build -W -b html doc/source doc/build/html sphinx-build -W -b html doc/source doc/build/html
[testenv:cover] [testenv:cover]
basepython = python3
commands = python setup.py test --coverage --coverage-package-name=oslo_utils --testr-args='{posargs}' commands = python setup.py test --coverage --coverage-package-name=oslo_utils --testr-args='{posargs}'
[testenv:bandit] [testenv:bandit]
basepython = python3
commands = bandit -r oslo_utils -x tests -n5 commands = bandit -r oslo_utils -x tests -n5
[flake8] [flake8]
@ -42,10 +46,12 @@ show-source = True
exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,__init__.py
[testenv:releasenotes] [testenv:releasenotes]
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt deps = -r{toxinidir}/doc/requirements.txt
commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
[testenv:lower-constraints] [testenv:lower-constraints]
basepython = python3
deps = deps =
-c{toxinidir}/lower-constraints.txt -c{toxinidir}/lower-constraints.txt
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt