Update make test to run through tox

gaqzi · Sep 7, 2014 · b77072e · b77072e
1 parent 8338c54
commit b77072e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,8 @@
 language: python
 # command to install dependencies
 install:
-  - pip install tox
   - pip install coveralls
   - pip install -q -r requirements.txt
 # command to run tests
-script: tox
+script: make test
 after_success: coveralls
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ BOWER=$(CURDIR)/node_modules/.bin/bower
 default: coverage
 
 test-py:
-	coverage run test/runtests.py
+	tox
 
 test-js: node_modules
 	$(KARMA) start test/karma.conf.js --single-run \

diff --git a/requirements.txt b/requirements.txt
@@ -2,3 +2,4 @@ django>=1.4
 coverage>=3.6
 nose>=1.3.0
 django-nose>=1.1
+tox>=1.6