Cleanup tox.ini, enable constraints

Remove old and unused constraints environments from tox.ini. Those
have never been used. Use standard environments as default list.

Enable use of constraints for all tox based jobs.

For more information about constraints see:
http://lists.openstack.org/pipermail/openstack-dev/2016-August/101474.html

Change-Id: I678b108bbd9ca2527b4f9090bb8ef1e84977dee2
This commit is contained in:
Andreas Jaeger 2016-08-26 16:43:01 +02:00
parent 3d34c84c2e
commit 4b389bc03b

22
tox.ini
View File

@ -5,9 +5,7 @@ skipsdist = True
[testenv] [testenv]
usedevelop = True usedevelop = True
install_command = install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
constraints: {[testenv:common-constraints]install_command}
pip install -U {opts} {packages}
whitelist_externals = bash whitelist_externals = bash
find find
rm rm
@ -22,44 +20,26 @@ commands =
bash tools/pretty_tox.sh '{posargs}' bash tools/pretty_tox.sh '{posargs}'
[testenv:common-constraints]
install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
[testenv:pep8] [testenv:pep8]
commands = commands =
doc8 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst doc8 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
bash tools/flake8wrap.sh {posargs} bash tools/flake8wrap.sh {posargs}
bandit -r zun -x tests -n5 -ll bandit -r zun -x tests -n5 -ll
[testenv:pep8-constraints]
commands = flake8 {posargs}
[testenv:venv] [testenv:venv]
commands = {posargs} commands = {posargs}
[testenv:venv-constraints]
commands = {posargs}
[testenv:cover] [testenv:cover]
commands = python setup.py test --coverage --testr-args='{posargs}' commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:cover-constraints]
commands = python setup.py test --coverage --testr-args='{posargs}'
[testenv:docs] [testenv:docs]
commands = commands =
doc8 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst doc8 -e .rst doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
python setup.py build_sphinx python setup.py build_sphinx
[testenv:docs-constraints]
commands = python setup.py build_sphinx
[testenv:debug] [testenv:debug]
commands = oslo_debug_helper {posargs} commands = oslo_debug_helper {posargs}
[testenv:debug-constraints]
commands = oslo_debug_helper {posargs}
[flake8] [flake8]
show-source = True show-source = True
builtins = _ builtins = _