summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-06-06 12:21:38 +0000
committerGerrit Code Review <review@openstack.org>2013-06-06 12:21:38 +0000
commit35f90d719f2941fb6f2b660c18980bc9a93d2754 (patch)
treecd9803bdf1d9d3c8a9e8f052c800b5522c1e50ca /tox.ini
parent3f315db8dab8a859e7204e7ac184ea9796273a74 (diff)
parent70747145f9cd8e19280ea9958f6fccc8f95fbe44 (diff)
downloadoslo-35f90d719f2941fb6f2b660c18980bc9a93d2754.tar.gz
oslo-35f90d719f2941fb6f2b660c18980bc9a93d2754.tar.xz
oslo-35f90d719f2941fb6f2b660c18980bc9a93d2754.zip
Merge "Rename requires files to standard names."
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index 379bc11..1570db5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,8 +9,8 @@ setenv = VIRTUAL_ENV={envdir}
NOSE_OPENSTACK_YELLOW=0.025
NOSE_OPENSTACK_SHOW_ELAPSED=1
NOSE_OPENSTACK_STDOUT=1
-deps = -r{toxinidir}/tools/pip-requires
- -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands =
python tools/patch_tox_venv.py
nosetests --with-doctest --exclude-dir=tests/testmods {posargs}