Merge " Rename requires files to standard names."

2013-06-09 14:30:02 +00:00
parent 245c616aae ae2a91f255
commit 068cf76bd2
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
@@ -6,8 +6,8 @@ setenv = VIRTUAL_ENV={envdir}
         LANG=en_US.UTF-8
         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]