TST/CI Fixes import for hashing test for PyPy (scikit-learn#15170)

thomasjpfan · rth · commit fbfb4da6b3b8 · 2019-10-13T14:43:40.000+02:00
diff --git a/sklearn/feature_extraction/tests/test_feature_hasher.py b/sklearn/feature_extraction/tests/test_feature_hasher.py
@@ -47,6 +47,7 @@ def test_feature_hasher_strings():
 
 def test_hashing_transform_seed():
     # check the influence of the seed when computing the hashes
+    # import is here to avoid importing on pypy
     from sklearn.feature_extraction._hashing import (
             transform as _hashing_transform)
     raw_X = [["foo", "bar", "baz", "foo".encode("ascii")],
diff --git a/sklearn/utils/testing.py b/sklearn/utils/testing.py
@@ -580,7 +580,7 @@ def set_random_state(estimator, random_state=0):
                                        reason='skipped on 32bit platforms')
     skip_travis = pytest.mark.skipif(os.environ.get('TRAVIS') == 'true',
                                      reason='skip on travis')
-    fails_if_pypy = pytest.mark.xfail(IS_PYPY, raises=NotImplementedError,
+    fails_if_pypy = pytest.mark.xfail(IS_PYPY,
                                       reason='not compatible with PyPy')
     skip_if_no_parallel = pytest.mark.skipif(not joblib.parallel.mp,
                                              reason="joblib is in serial mode")
