Skip to content

[MRG] MNT Updates pypy to use 7.2.0 #15954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Dec 29, 2019
Merged

[MRG] MNT Updates pypy to use 7.2.0 #15954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a89d3dc
MNT Updates pypy
thomasjpfan Dec 23, 2019
cdf23b3
ENH Update pip
thomasjpfan Dec 23, 2019
6299dfb
MNT Installs scipy from wheels
thomasjpfan Dec 23, 2019
d8620ce
MNT Fix pip command
thomasjpfan Dec 23, 2019
d59fd39
MNT Install each package explicitly
thomasjpfan Dec 23, 2019
2d1ddf5
MNT Adds explicit versioning
thomasjpfan Dec 23, 2019
b51d167
BUG Fixes pypy test settings
thomasjpfan Dec 28, 2019
008e84b
BUG Fix pypy doctest string
thomasjpfan Dec 28, 2019
089a4b0
Merge branch 'master' into pypy-fix
thomasjpfan Dec 29, 2019
c84e0b3
REV
thomasjpfan Dec 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 8 additions & 5 deletions build_tools/circle/build_test_pypy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
5 changes: 2 additions & 3 deletions sklearn/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down