Merge "Rename pip/test-requires to standard naming"

2014-05-26 16:59:35 +00:00 · 2014-05-26 16:59:35 +00:00 · 29104fd110
commit 29104fd110
parent ffe1c2ee10 ce35f9b847
3 changed files with 2 additions and 2 deletions
--- a/tools/pip-requires
+++ b/tools/pip-requires
--- a/test-requirements.txt
+++ b/test-requirements.txt
--- a/tox.ini
+++ b/tox.ini
@ -7,8 +7,8 @@ setenv = VIRTUAL_ENV={envdir}
         LANGUAGE=en_US:en
         LC_ALL=C

-deps = -r{toxinidir}/tools/pip-requires
-       -r{toxinidir}/tools/test-requires
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = python setup.py testr --testr-args='{posargs}'

 [testenv:pep8]