Ignore deprecation warnings and skip new tests that use hashing

rth · rth · commit 16b9f768a714 · 2018-09-14T13:53:50.000+02:00
diff --git a/build_tools/circle/build_test_pypy.sh b/build_tools/circle/build_test_pypy.sh
@@ -25,7 +25,7 @@ ccache -M 512M
 export CCACHE_COMPRESS=1
 export PATH=/usr/lib/ccache:$PATH
 
-pip install -e .
+pip install -vv -e . 
 
-pytest -n 1 sklearn/
+pytest -n 1 -Wignore::DeprecationWarning -Wignore::FutureWarning sklearn/
 make test-sphinxext test-doc
diff --git a/conftest.py b/conftest.py
@@ -17,14 +17,17 @@
     raise('Your version of pytest is too old, you should have at least '
           'pytest >= {} installed.'.format(PYTEST_MIN_VERSION))
 
+
 def pytest_collection_modifyitems(config, items):
 
     # FeatureHasher is not compatible with PyPy
     if platform.python_implementation() == 'PyPy':
         skip_marker = pytest.mark.skip(
             reason='FeatureHasher is not compatible with PyPy')
         for item in items:
-            if item.name == 'sklearn.feature_extraction.hashing.FeatureHasher':
+            if item.name in (
+                    'sklearn.feature_extraction.hashing.FeatureHasher',
+                    'sklearn.feature_extraction.text.HashingVectorizer'):
                 item.add_marker(skip_marker)
 
     # numpy changed the str/repr formatting of numpy arrays in 1.14. We want to
diff --git a/sklearn/feature_extraction/tests/test_text.py b/sklearn/feature_extraction/tests/test_text.py
@@ -1108,6 +1108,8 @@ def test_vectorizers_invalid_ngram_range(vec):
     message = ("Invalid value for ngram_range=%s "
                "lower boundary larger than the upper boundary."
                % str(invalid_range))
+    if isinstance(vec, HashingVectorizer):
+        pytest.xfail(reason='HashingVectorizer not supported on PyPy')
 
     assert_raise_message(
         ValueError, message, vec.fit, ["good news everyone"])
@@ -1119,6 +1121,7 @@ def test_vectorizers_invalid_ngram_range(vec):
             ValueError, message, vec.transform, ["good news everyone"])
 
 
+@fails_if_pypy
 def test_vectorizer_stop_words_inconsistent():
     if PY2:
         lstr = "[u'and', u'll', u've']"
