summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makefile8
-rw-r--r--test-requirements.txt1
2 files changed, 7 insertions, 2 deletions
diff --git a/makefile b/makefile
index 692bf41..7de020e 100644
--- a/makefile
+++ b/makefile
@@ -1,7 +1,11 @@
.PHONY: test upload clean bootstrap setup
-test: bootstrap
- sh -c '. _virtualenv/bin/activate; nosetests -m'\''^$$'\'' `find tests -name '\''*.py'\''`'
+test:
+ _virtualenv/bin/nosetests tests
+
+test-all: setup
+ _virtualenv/bin/tox
+ make clean
upload: setup
python setup.py sdist upload
diff --git a/test-requirements.txt b/test-requirements.txt
index 0798378..194ee54 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1 +1,2 @@
nose>=1.3.0,<2
+tox>=1.6.1,<2.0