From a65d1a8b1a0fbd64e4eea7d6517b3d6229117aaa Mon Sep 17 00:00:00 2001 From: Rose Wiegley Date: Mon, 10 Aug 2015 19:54:34 -0600 Subject: [PATCH] Remove requirements.txt from tox.ini Now inserted by PBR Change-Id: I02a15850ed5fb6f98d1d35229565f8142964f53b --- tox.ini | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index 8edda9766..71e7a103b 100644 --- a/tox.ini +++ b/tox.ini @@ -7,8 +7,7 @@ skipsdist = True setenv = VIRTUAL_ENV={envdir} usedevelop = True install_command = {toxinidir}/tools/tox_install.sh {opts} {packages} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt whitelist_externals = sh commands = sh tools/pretty_tox.sh '{posargs}' @@ -81,8 +80,6 @@ setenv = TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc} [testenv:scenario] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt sitepackages = True setenv = OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/scenario @@ -90,8 +87,6 @@ setenv = TEMPEST_CONFIG_DIR={env:TEMPEST_CONFIG_DIR:/opt/stack/tempest/etc} [testenv:ddt] -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt sitepackages = True setenv = OS_TEST_PATH={toxinidir}/neutron_lbaas/tests/tempest/v2/ddt