Merge pull request #3789 from munkm/pytest

modify contributing instructions to use pytest for testing
jupyter · Sep 26, 2018 · 5711075 · 5711075
2 parents 26ec595 + f9d578e
commit 5711075
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -136,11 +136,11 @@ Install dependencies::
 
 To run the Python tests, use::
 
-    nosetests
+    pytest
 
 If you want coverage statistics as well, you can run::
 
-    nosetests --with-coverage --cover-package=notebook notebook
+    py.test --cov notebook -v --pyargs notebook
 
 JavaScript Tests
 ^^^^^^^^^^^^^^^^

diff --git a/setup.py b/setup.py
@@ -117,7 +117,7 @@
         ':python_version == "2.7"': ['ipaddress'],
         'test:python_version == "2.7"': ['mock'],
         'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
-                 'nbval', 'nose-exclude', 'selenium'],
+                 'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
         'test:sys_platform == "win32"': ['nose-exclude'],
     },
     python_requires = '>=3.4',