Skip to content

Commit

Permalink
Merge pull request #43 from pgajdos/master
Browse files Browse the repository at this point in the history
do not depend on deprecated nose
  • Loading branch information
vidartf authored Jul 17, 2020
2 parents 5b95791 + 9840783 commit af2ebee
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ htmlcov/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ python:
sudo: false
install:
- pip install -U pip
- pip install -U --upgrade-strategy eager ".[test]" coveralls
- pip install -U --upgrade-strategy eager ".[test]" coveralls pytest-cov
- pip freeze
script:
- nosetests --with-coverage --cover-package traittypes traittypes
- pytest --cov=traittypes traittypes
after_success:
- coveralls
7 changes: 3 additions & 4 deletions traittypes/tests/test_import_errors.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

import nose.tools as nt
import pytest

from ..traittypes import _DelayedImportError


@nt.raises(RuntimeError)
def test_delayed_access_raises():
dummy = _DelayedImportError('mypackage')
dummy.asarray([1, 2, 3])
with pytest.raises(RuntimeError):
dummy.asarray([1, 2, 3])

0 comments on commit af2ebee

Please sign in to comment.