updated tox.ini so that pysph test runs fast tests only

replaced nose with pytest in install_requires list in setup.py updated makefile
pypr · May 12, 2017 · a6b8453 · a6b8453
1 parent 79622b7
commit a6b8453
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -53,10 +53,10 @@ cleanall : clean
 #	-rm $(patsubst %.pyx,%.c,$(wildcard $(PKG)/*/*.pyx))
 
 test :
-	python `which nosetests` --exe -a '!slow' pysph
+	python `which pytest` -m 'not slow' pysph
 
 testall :
-	python `which nosetests` --exe pysph
+	python `which pytest` pysph
 
 epydoc :
 	python cython-epydoc.py --config epydoc.cfg pysph

diff --git a/setup.py b/setup.py
@@ -565,7 +565,7 @@ def setup_package():
     # The requirements.
     install_requires = [
         'numpy', 'mako', 'Cython>=0.20', 'setuptools>=6.0',
-        'nose>=1.0.0', 'execnet', 'psutil',
+        'pytest>=3.0', 'execnet', 'psutil',
     ]
     if sys.version_info[:2] == (2, 6):
         install_requires += [

diff --git a/tox.ini b/tox.ini
@@ -3,6 +3,7 @@ envlist = py26,py27,py34,py35
 skip_missing_interpreters = True
 
 [pytest]
+addopts = -m "not slow"
 
 [testenv]
 sitepackages = True