Small testing changes

sudorandom · sudorandom · commit 7a9fabd56ed8 · 2013-12-18T13:40:29.000-06:00
requirements.txt is now broken up into two files:
 - tools/requirements.txt
 - tools/test-requirements.txt

Tox now installs test dependencies using tools/test-requirements.txt
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,7 +1,3 @@
-tox
-nose
-mock
-coverage
 requests
 prettytable >= 0.7.0
 docopt == 0.6.1
diff --git a/tools/test-requirements.txt b/tools/test-requirements.txt
@@ -0,0 +1,4 @@
+tox
+nose
+mock
+coverage
diff --git a/tox.ini b/tox.ini
@@ -2,29 +2,19 @@
 envlist = py26,py27,py32,py33,pypy,pep8
 
 [testenv]
-commands = {envpython} setup.py nosetests []
 deps =
-    nose
-    yanc
     unittest2
-    mock
-    coverage
+    -r{toxinidir}/tools/test-requirements.txt
+commands = {envpython} setup.py nosetests []
+    
 
 [testenv:py32]
+deps = -r{toxinidir}/tools/test-requirements.txt
 commands = {envpython} setup.py nosetests []
-deps =
-    nose
-    yanc
-    mock
-    coverage
 
 [testenv:py33]
+deps = -r{toxinidir}/tools/test-requirements.txt
 commands = {envpython} setup.py nosetests []
-deps =
-    nose
-    yanc
-    mock
-    coverage
 
 [testenv:pep8]
 deps = flake8

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +tox
 +nose
 +mock
 +coverage