Use pytest for now since nose isn’t compatible with 1.8 yet

django-oscar · Apr 8, 2015 · 32dc78f · 32dc78f
1 parent 2d561cb
commit 32dc78f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -69,8 +69,7 @@ docs:
 	cd docs && make html
 
 coverage:
-	coverage run ./runtests.py --with-xunit
-	coverage xml -i
+	py.test --cov=oscar --cov-report=xml --junit-xml=junit.xml tests/
 
 lint:
 	./lint.sh
@@ -104,7 +103,7 @@ css:
 clean:
 	# Remove files not in source control
 	find . -type f -name "*.pyc" -delete
-	rm -rf nosetests.xml coverage.xml htmlcov *.egg-info *.pdf dist violations.txt
+	rm -rf junit.xml coverage.xml htmlcov *.egg-info *.pdf dist violations.txt
 
 preflight: lint
     # Bare minimum of tests to run before pushing to master

diff --git a/requirements.txt b/requirements.txt
@@ -24,6 +24,10 @@ sphinx_rtd_theme==0.1.6
 django-dynamic-fixture==1.8.1
 coverage==3.7.1
 django-nose==1.3
+
+pytest==2.7.0
+pytest-cov==1.8.1
+pytest-django==2.8.0
 spec==0.11.1
 WebTest==2.0.17
 django-webtest==1.7.7