Use tox 3.1.1 and basepython fix
tox 3.1.1 fixed https://github.com/tox-dev/tox/issues/477 which mishandled the basepython directive. Require this version and remove the workarounds. http://lists.openstack.org/pipermail/openstack-dev/2018-July/132085.html Change-Id: Iccc0284c725dc5dea18d1e30cc35bd185119535d
This commit is contained in:
parent
bb7162b26d
commit
fa64a93c96
17
tox.ini
17
tox.ini
|
@ -1,9 +1,14 @@
|
||||||
[tox]
|
[tox]
|
||||||
minversion = 1.6
|
minversion = 3.1.1
|
||||||
envlist = py35,py27,pep8
|
envlist = py35,py27,pep8
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
# Automatic envs (pyXX) will use the python version appropriate to that
|
||||||
|
# env and ignore basepython inherited from [testenv]. That's what we
|
||||||
|
# want, and we don't need to be warned about it.
|
||||||
|
ignore_basepython_conflict = True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
|
basepython = python3
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command = pip install {opts} {packages}
|
install_command = pip install {opts} {packages}
|
||||||
setenv =
|
setenv =
|
||||||
|
@ -24,31 +29,24 @@ commands =
|
||||||
find . -type f -name "*.pyc" -delete
|
find . -type f -name "*.pyc" -delete
|
||||||
|
|
||||||
[testenv:py27]
|
[testenv:py27]
|
||||||
# TODO(efried): Remove this once https://github.com/tox-dev/tox/issues/425 is fixed.
|
|
||||||
basepython = python2.7
|
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
[testenv:py35]
|
[testenv:py35]
|
||||||
# TODO(efried): Remove this once https://github.com/tox-dev/tox/issues/425 is fixed.
|
|
||||||
basepython = python3.5
|
|
||||||
commands =
|
commands =
|
||||||
{[testenv]commands}
|
{[testenv]commands}
|
||||||
stestr run {posargs}
|
stestr run {posargs}
|
||||||
stestr slowest
|
stestr slowest
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
|
||||||
commands = flake8
|
commands = flake8
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
basepython = python3
|
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:cover]
|
[testenv:cover]
|
||||||
basepython = python3
|
|
||||||
# TODO(stephenfin): Remove the PYTHON hack below in favour of a [coverage]
|
# TODO(stephenfin): Remove the PYTHON hack below in favour of a [coverage]
|
||||||
# section once we rely on coverage 4.3+
|
# section once we rely on coverage 4.3+
|
||||||
#
|
#
|
||||||
|
@ -66,14 +64,12 @@ commands =
|
||||||
coverage report
|
coverage report
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
basepython = python3
|
|
||||||
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}
|
||||||
-r{toxinidir}/doc/requirements.txt
|
-r{toxinidir}/doc/requirements.txt
|
||||||
commands = sphinx-build -W -b html doc/source doc/build/html
|
commands = sphinx-build -W -b html doc/source doc/build/html
|
||||||
|
|
||||||
[testenv:bashate]
|
[testenv:bashate]
|
||||||
basepython = python3
|
|
||||||
commands =
|
commands =
|
||||||
bash -c "ls devstack/*.sh | xargs bashate -v {posargs}"
|
bash -c "ls devstack/*.sh | xargs bashate -v {posargs}"
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
|
@ -87,7 +83,6 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,t
|
||||||
local-check-factory = nova_powervm.hacking.checks.factory
|
local-check-factory = nova_powervm.hacking.checks.factory
|
||||||
|
|
||||||
[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
|
||||||
|
|
Loading…
Reference in New Issue