diff --git a/tox.ini b/tox.ini index 62b9248b9a..050b8fc1fe 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,6 @@ skipsdist = True [testenv] usedevelop = True 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} whitelist_externals = bash find @@ -27,9 +26,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 @@ -76,13 +72,6 @@ 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] # NOTE(jaegerandi): This target does not use constraints because # 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} 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] # 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 @@ -111,10 +91,6 @@ install_command = pip install -U {opts} {packages} 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] # NOTE(NiallBunting) This is a post job. So upper constraints will not # apply here. @@ -123,10 +99,6 @@ 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