From 71685f16f1a65199b283b4d1212e6bacf1189034 Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Fri, 16 Oct 2015 14:30:59 +1300 Subject: [PATCH] Remove redundant deps in tox.ini. Tox installs the current tree (either via an sdist or as a develop install) always. Our requirements.txt are reflected into the metadata of that tree, so we shouldn't use requirements.txt directly - it just means that we'd be hiding from ourselves issues like e.g. using URLs which can't be reflected properly. Change-Id: Id096f1d1971cb8a19f9e86ba57957b39e00bd6f5 --- tox.ini | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/tox.ini b/tox.ini index 17905fa73..71b3604d1 100644 --- a/tox.ini +++ b/tox.ini @@ -16,8 +16,7 @@ setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./nova/tests/unit LANGUAGE=en_US LC_ALL=en_US.utf-8 -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete bash tools/pretty_tox.sh '{posargs}' @@ -34,8 +33,6 @@ commands = [testenv:py34] setenv = {[testenv]setenv} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete python -m subunit.run discover -t . ./nova/tests/ --list @@ -47,8 +44,6 @@ install_command = pip install -U --force-reinstall {opts} {packages} setenv = VIRTUAL_ENV={envdir} OS_TEST_PATH=./nova/tests/functional LANGUAGE=en_US -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt commands = find . -type f -name "*.pyc" -delete bash tools/pretty_tox.sh '{posargs}' @@ -77,7 +72,6 @@ commands = oslo-config-generator --config-file=etc/nova/nova-config-generator.conf [testenv:bandit] -deps = -r{toxinidir}/test-requirements.txt commands = bandit -c bandit.yaml -r nova -n 5 -ll [flake8] @@ -104,5 +98,4 @@ import_exceptions = nova.i18n # this also means that pip-missing-reqs must be installed separately, outside # of the requirements.txt files deps = pip_missing_reqs - -rrequirements.txt commands=pip-missing-reqs -d --ignore-file=nova/tests/* --ignore-file=nova/test.py nova