Resolving conflicts from cabrera-py33_fixes.

1 files changed, 2 insertions, 4 deletions

diff --git a/tox.ini b/tox.ini
index 693169e..60348cb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,19 +7,17 @@ skipsdist = True
 usedevelop = True
 # Customize pip command, add -U to force updates.
 install_command = pip install -U {opts} {packages}
-deps = nose
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs}
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-deps = hacking
 commands = flake8
 
 [testenv:cover]
-deps = nose
-       coverage
 commands = nosetests --with-coverage {posargs}
 
 [flake8]