Merge "Move Babel and argparse from test-requirements.txt"

2014-01-21 20:46:41 +00:00 · 2014-01-21 20:46:41 +00:00 · f8081bbd83
parent 58c755cf4c 7fd212c019
commit f8081bbd83
3 changed files with 4 additions and 3 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -0,0 +1,2 @@
+Babel>=1.3
+argparse
--- a/test-requirements.txt
+++ b/test-requirements.txt
@ -4,5 +4,3 @@ coverage>=3.6
 discover
 testrepository>=0.0.17
 testtools>=0.9.32
-Babel>=1.3
-argparse
--- a/tox.ini
+++ b/tox.ini
@ -9,7 +9,8 @@ install_command = pip install -U {opts} {packages}
 setenv = LANG=en_US.UTF-8
         LANGUAGE=en_US:en
         LC_ALL=C
-deps= -r{toxinidir}/test-requirements.txt
+deps= -r{toxinidir}/requirements.txt
+      -r{toxinidir}/test-requirements.txt
 commands=
    python setup.py testr --slowest --testr-args='{posargs}'