[MRG] MNT Updates pypy to use 7.2.0 (#15954)

thomasjpfan · rth · commit 1e166f77f83d · 2019-12-30T00:18:40.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -101,7 +101,7 @@ jobs:
 
   pypy3:
     docker:
-      - image: pypy:3.6-7.1.1
+      - image: pypy:3.6-7.2.0
     steps:
       - restore_cache:
           keys:
diff --git a/build_tools/circle/build_test_pypy.sh b/build_tools/circle/build_test_pypy.sh
@@ -18,11 +18,14 @@ source pypy-env/bin/activate
 python --version
 which python
 
-# XXX: numpy version pinning can be reverted once PyPy
-#      compatibility is resolved for numpy v1.6.x. For instance,
-#      when PyPy3 >6.0 is released (see numpy/numpy#12740)
-pip install --extra-index https://antocuni.github.io/pypy-wheels/ubuntu numpy Cython pytest
-pip install scipy sphinx numpydoc docutils joblib pillow
+pip install -U pip
+
+# pins versions to install wheel from https://antocuni.github.io/pypy-wheels/manylinux2010
+pip install --extra-index-url https://antocuni.github.io/pypy-wheels/manylinux2010 numpy==1.18.0 scipy==1.3.2
+
+# Install Cython directly
+pip install https://antocuni.github.io/pypy-wheels/ubuntu/Cython/Cython-0.29.14-py3-none-any.whl
+pip install sphinx numpydoc docutils joblib pillow pytest
 
 ccache -M 512M
 export CCACHE_COMPRESS=1
diff --git a/conftest.py b/conftest.py
@@ -37,7 +37,7 @@ def pytest_collection_modifyitems(config, items):
         skip_marker = pytest.mark.skip(
             reason='FeatureHasher is not compatible with PyPy')
         for item in items:
-            if item.name.endswith(('hashing.FeatureHasher',
+            if item.name.endswith(('_hash.FeatureHasher',
                                    'text.HashingVectorizer')):
                 item.add_marker(skip_marker)
 
diff --git a/sklearn/exceptions.py b/sklearn/exceptions.py
@@ -139,9 +139,8 @@ class FitFailedWarning(RuntimeWarning):
     ...     print(repr(w[-1].message))
     FitFailedWarning('Estimator fit failed. The score on this train-test
     partition for these parameters will be set to 0.000000.
-    Details:
-    \\nTraceback (most recent call last):...\\nValueError:
-    Penalty term must be positive; got (C=-2)\\n')
+    Details:...Traceback (most recent call last):...ValueError:
+    Penalty term must be positive; got (C=-2)...
 
 
     .. versionchanged:: 0.18
