Merge pull request #43 from pgajdos/master

do not depend on deprecated nose

Author: vidartf

.gitignore

@@ -39,7 +39,6 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
-nosetests.xml
 coverage.xml
 *,cover
 

.travis.yml

@@ -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

traittypes/tests/test_import_errors.py

@@ -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])