Skip to content

Commit fdf14b4

Browse files
committed
run tests with pytest
1 parent ec3c3dd commit fdf14b4

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919

2020
before_install:
2121
- pip install --upgrade pip
22-
- pip install --upgrade setuptools wheel nose coverage codecov
22+
- pip install --upgrade setuptools wheel pytest pytest-cov coverage codecov
2323
- nvm install 6.9.2
2424
- nvm use 6.9.2
2525
- node --version
@@ -65,7 +65,7 @@ script:
6565
true
6666
fi
6767
- 'if [[ $GROUP == js* ]]; then travis_retry python -m notebook.jstest ${GROUP:3}; fi'
68-
- 'if [[ $GROUP == python ]]; then nosetests -v --exclude-dir notebook/tests/selenium --with-coverage --cover-package=notebook notebook; fi'
68+
- 'if [[ $GROUP == python ]]; then py.test -v --ignore notebook/tests/selenium --cov=notebook notebook; fi'
6969
- 'if [[ $GROUP == selenium ]]; then py.test -sv notebook/tests/selenium; fi'
7070
- |
7171
if [[ $GROUP == docs ]]; then

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ install:
2121
- cmd: conda config --set show_channel_urls true
2222
- cmd: conda config --add channels conda-forge
2323
#- cmd: conda update --yes --quiet conda
24-
- cmd: conda install -y python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat ipykernel pip nodejs nose
24+
- cmd: conda install -y python=%CONDA_PY_SPEC% pyzmq tornado jupyter_client nbformat ipykernel pip nodejs pytest
2525
# not using `conda install -y` on nbconvent package because there is
2626
# currently a bug with the version that the anaconda installs, so we will just install it with pip
2727
- cmd: pip install nbconvert
2828
- cmd: python setup.py build
2929
- cmd: pip install .[test]
3030

3131
test_script:
32-
- nosetests -v notebook --exclude-dir notebook\tests\selenium
32+
- pytest -v notebook --exclude-dir notebook\tests\selenium

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
'prometheus_client'
116116
],
117117
extras_require = {
118-
'test': ['nose', 'coverage', 'requests', 'nose_warnings_filters',
119-
'nbval', 'nose-exclude', 'selenium', 'pytest', 'pytest-cov'],
118+
'test': ['pytest', 'coverage', 'requests',
119+
'nbval', 'selenium', 'pytest', 'pytest-cov'],
120120
'docs': ['sphinx', 'nbsphinx', 'sphinxcontrib_github_alt', 'sphinx_rtd_theme'],
121121
'test:sys_platform != "win32"': ['requests-unixsocket'],
122122
'json-logging': ['json-logging']

0 commit comments

Comments
 (0)