moved to py.test and tox, added python 3.5 test env

stchris · Jul 20, 2016 · a5716f5 · a5716f5
1 parent 6500d1b
commit a5716f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ compile:
 	python -m compileall -q untangle.py tests/tests.py
 
 test:
-	nosetests --exe tests/
+	tox
 
 # needs python-stdeb
 package_deb:

diff --git a/tox.ini b/tox.ini
@@ -4,9 +4,9 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py25, py26, py27, py31, py32, py33, py34, pypy
+envlist = py25, py26, py27, py32, py33, py34, py35, pypy
+skip_missing_interpreters = true
 
 [testenv]
-commands = make test
+commands = py.test tests/tests.py
 deps = pytest
-