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