Remove constraints envs from tox.ini

The constraints environments are not used at all, they have been
obsoleted everywhere in OpenStack. Remove them completely.

Now the normal jobs can use constraints - as magnum already does.

(cherry picked from 5364356b99)

Depends-On: I2445f257ace93830328a77dd3993a93e1896cb95
Change-Id: I370568efd7caa8e8115e3e7843fc21753d3c5604
This commit is contained in:
Andreas Jaeger 2016-04-17 17:04:24 +02:00 committed by Spyros Trigazis
parent 8a9e4089aa
commit d1466e02b0
1 changed files with 1 additions and 29 deletions

30
tox.ini
View File

@ -6,8 +6,7 @@ skipsdist = True
[testenv]
usedevelop = True
install_command =
constraints: {[testenv:common-constraints]install_command}
pip install -U {opts} {packages}
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/mitaka} -U {opts} {packages}
whitelist_externals = bash
find
setenv =
@ -26,9 +25,6 @@ commands = oslo_debug_helper {posargs}
basepython = python2.7
commands = oslo_debug_helper {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:functional-api]
sitepackages = True
setenv = OS_TEST_PATH=./magnum/tests/functional/api
@ -75,46 +71,22 @@ commands =
bash tools/flake8wrap.sh {posargs}
bandit -r magnum -x tests -n5 -ll
[testenv:pep8-constraints]
install_command = {[testenv:common-constraints]install_command}
commands =
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
bash tools/flake8wrap.sh {posargs}
bandit -r magnum -x tests -n5 -ll
[testenv:venv]
commands = {posargs}
[testenv:venv-constraints]
install_command = {[testenv:common-constraints]install_command}
commands = {posargs}
[testenv:bandit]
deps = -r{toxinidir}/test-requirements.txt
commands = bandit -r magnum -x tests -n5 -ll
[testenv:bandit-constraints]
install_command = {[testenv:common-constraints]install_command}
deps = {[testenv:bandit]deps}
commands = {[testenv:bandit]commands}
[testenv:cover]
commands = python setup.py testr --coverage --testr-args='{posargs}'
coverage report
[testenv:cover-constraints]
install_command = {[testenv:common-constraints]install_command}
commands = python setup.py testr --coverage --testr-args='{posargs}'
[testenv:docs]
commands =
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
python setup.py build_sphinx
[testenv:docs-constraints]
install_command = {[testenv:common-constraints]install_command}
commands = {[testenv:docs]commands}
[testenv:genconfig]
commands =
oslo-config-generator --config-file etc/magnum/magnum-config-generator.conf