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. Change-Id: Iecec444fba59923c7894c1fd2a90aebbfdc4724d
This commit is contained in:
parent
e3fef8412f
commit
5364356b99
28
tox.ini
28
tox.ini
|
@ -6,7 +6,6 @@ skipsdist = True
|
||||||
[testenv]
|
[testenv]
|
||||||
usedevelop = True
|
usedevelop = True
|
||||||
install_command =
|
install_command =
|
||||||
constraints: {[testenv:common-constraints]install_command}
|
|
||||||
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
|
pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -U {opts} {packages}
|
||||||
whitelist_externals = bash
|
whitelist_externals = bash
|
||||||
find
|
find
|
||||||
|
@ -27,9 +26,6 @@ commands = oslo_debug_helper {posargs}
|
||||||
basepython = python2.7
|
basepython = python2.7
|
||||||
commands = oslo_debug_helper {posargs}
|
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]
|
[testenv:functional-api]
|
||||||
sitepackages = True
|
sitepackages = True
|
||||||
setenv = OS_TEST_PATH=./magnum/tests/functional/api
|
setenv = OS_TEST_PATH=./magnum/tests/functional/api
|
||||||
|
@ -76,13 +72,6 @@ commands =
|
||||||
bash tools/flake8wrap.sh {posargs}
|
bash tools/flake8wrap.sh {posargs}
|
||||||
bandit -r magnum -x tests -n5 -ll
|
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]
|
[testenv:venv]
|
||||||
# NOTE(jaegerandi): This target does not use constraints because
|
# NOTE(jaegerandi): This target does not use constraints because
|
||||||
# upstream infra does not yet support it. Once that's fixed, we can
|
# upstream infra does not yet support it. Once that's fixed, we can
|
||||||
|
@ -90,19 +79,10 @@ commands =
|
||||||
install_command = pip install -U --force-reinstall {opts} {packages}
|
install_command = pip install -U --force-reinstall {opts} {packages}
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
|
||||||
[testenv:venv-constraints]
|
|
||||||
install_command = {[testenv:common-constraints]install_command}
|
|
||||||
commands = {posargs}
|
|
||||||
|
|
||||||
[testenv:bandit]
|
[testenv:bandit]
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = bandit -r magnum -x tests -n5 -ll
|
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]
|
[testenv:cover]
|
||||||
# NOTE(NiallBunting) Infra does not support constraints for the cover
|
# NOTE(NiallBunting) Infra does not support constraints for the cover
|
||||||
# job. While the file is set no file is there. Can be removed once infra
|
# job. While the file is set no file is there. Can be removed once infra
|
||||||
|
@ -111,10 +91,6 @@ install_command = pip install -U {opts} {packages}
|
||||||
commands = python setup.py testr --coverage --testr-args='{posargs}'
|
commands = python setup.py testr --coverage --testr-args='{posargs}'
|
||||||
coverage report
|
coverage report
|
||||||
|
|
||||||
[testenv:cover-constraints]
|
|
||||||
install_command = {[testenv:common-constraints]install_command}
|
|
||||||
commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|
||||||
|
|
||||||
[testenv:docs]
|
[testenv:docs]
|
||||||
# NOTE(NiallBunting) This is a post job. So upper constraints will not
|
# NOTE(NiallBunting) This is a post job. So upper constraints will not
|
||||||
# apply here.
|
# apply here.
|
||||||
|
@ -123,10 +99,6 @@ commands =
|
||||||
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
|
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
|
||||||
python setup.py build_sphinx
|
python setup.py build_sphinx
|
||||||
|
|
||||||
[testenv:docs-constraints]
|
|
||||||
install_command = {[testenv:common-constraints]install_command}
|
|
||||||
commands = {[testenv:docs]commands}
|
|
||||||
|
|
||||||
[testenv:genconfig]
|
[testenv:genconfig]
|
||||||
commands =
|
commands =
|
||||||
oslo-config-generator --config-file etc/magnum/magnum-config-generator.conf
|
oslo-config-generator --config-file etc/magnum/magnum-config-generator.conf
|
||||||
|
|
Loading…
Reference in New Issue