Skip to content

Commit dcd37a8

Browse files
committed
run tests with pytest
1 parent 5294c06 commit dcd37a8

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

.travis.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ python:
77
- 3.3
88
- 2.7
99
sudo: false
10-
before_install:
11-
- git clone --quiet --depth 1 https://github.com/minrk/travis-wheels travis-wheels
12-
1310
install:
14-
- pip install -U setuptools pip
15-
- pip install -f travis-wheels/wheelhouse -e .[test] codecov
16-
- python -c 'import ipykernel.kernelspec; ipykernel.kernelspec.install(user=True)'
11+
- pip install --upgrade setuptools pip
12+
- pip install --upgrade --pre -e .[test] pytest-cov pytest-warnings codecov
1713
script:
18-
- nosetests -v --with-coverage --cover-package jupyter_client jupyter_client
14+
- py.test --cov jupyter_client jupyter_client
1915
after_success:
20-
- codecov
16+
- codecov
2117
matrix:
2218
allow_failures:
2319
- python: nightly

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
]
8383

8484
extras_require = setuptools_args['extras_require'] = {
85-
'test': ['ipykernel', 'ipython', 'nose_warnings_filters'],
85+
'test': ['ipykernel', 'ipython', 'pytest'],
8686
}
8787

8888
if 'setuptools' in sys.modules:

0 commit comments

Comments
 (0)