summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup.cfg3
-rw-r--r--tox.ini9
2 files changed, 7 insertions, 5 deletions
diff --git a/setup.cfg b/setup.cfg
index cffcdfd46..ce26f6afe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,2 @@
[nosetests]
where=tests
-
-[aliases]
-dev = develop easy_install pip[testing]
diff --git a/tox.ini b/tox.ini
index accce820b..5c11058e8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,6 +3,11 @@ envlist =
py26,py27,py32,py33,pypy
[testenv]
+deps=
+ nose>=1.3.0
+ mock
+ scripttest>=1.1.1
+ git+https://github.com/pypa/virtualenv@develop#egg=virtualenv
commands =
- python setup.py dev
- python setup.py nosetests
+ nosetests -s -v tests
+