From f9d578ee405e767d7d52d6bf028f61ea54011682 Mon Sep 17 00:00:00 2001 From: Madicken Munk Date: Fri, 20 Jul 2018 16:52:21 -0500 Subject: [PATCH] add pytest to test env requirements and suggest it in contributing docs --- CONTRIBUTING.rst | 4 ++-- setup.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 5e108dc57..c480ecf0a 100644 --- 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 index 6d60391db..64115bafe 100755 --- a/setup.py +++ b/setup.py @@ -97,7 +97,7 @@ for more information. ':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'], }, entry_points = {