Merge pull request #42 from msabramo/simplify_tox_ini

tox.ini: Simplify
wearpants · Jan 28, 2015 · c79d0de · c79d0de
2 parents b2641a6 + 3510819
commit c79d0de
Showing 1 changed file with 2 additions and 9 deletions.
diff --git a/tox.ini b/tox.ini
@@ -7,13 +7,6 @@
 envlist = py26, py27, pypy, py33, py34
 
 [testenv]
-setenv =
-    TWIGGY_UNDER_TEST=1
+deps = -r{toxinidir}/test-requirements.txt
+setenv = TWIGGY_UNDER_TEST=1
 commands = py.test {posargs:--tb=short tests/}
-deps =
-    pytest
-
-[testenv:py26]
-deps =
-    pytest
-    unittest2