Skip to content
This repository was archived by the owner on Mar 15, 2022. It is now read-only.

Update wheel version installed for PyPy >= 7.3.0 #3

Merged
merged 2 commits into from
Feb 17, 2020

Conversation

YannickJadoul
Copy link
Contributor

In order to (finally) complete pypa/cibuildwheel#185, we need an up-to-date version of wheel (>= 0.34) after pypa/cibuildwheel#156 was merged.

However, wheel>=0.34 also defines new Python version tags for PyPy, resulting in different wheel filenames. As such, an update of the manylinux2010 image to use the new tags seems appropriate.

The updates of these packages in the base PyPA manylinux images are blocked on the matter of dropping Python 3.4 (and perhaps 2.7).

Note that the symlinks in /opt/python for PyPy 7.3.0 are changed by this PR. Alternatively, I thought of creating the old symlinks next to the new ones (i.e., /opt/python/pp273-pypy_73 as well as /opt/python/pp27-pypy_73) to ensure backwards compatibility. But this would cause users looping over all folders in /opt/python to encounter the same version twice.

(If merging this PR before pypa/manylinux gets updated is considered to be too early, a workaround should be possible in cibuildwheel to still update wheel manually, so I do not think we depend on this very critically.)

local exe=$1
$exe -c 'import sys; print("requirements-pre-7.3.0.txt" if sys.pypy_version_info < (7,3,0) else "requirements.txt")'
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is correct since pypy < 7.3 does not properly support pip>20 and wheel>0.34

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just for the record: I think I actually tried this installing pip 20 and wheel 0.34, and it seemed to work? (Except that the old directory symlinks got overwritten, since pp27-pypy_41 is ambiguous, being the new-style tag for both 7.1.x and 7.2.x.)

@mattip
Copy link
Member

mattip commented Feb 13, 2020

@antocuni any thoughts?

@antocuni
Copy link
Member

@antocuni any thoughts?

looks good to me

@mattip mattip merged commit 61df875 into pypy:master Feb 17, 2020
@mattip
Copy link
Member

mattip commented Feb 17, 2020

We should update the ensurepip versions of pip and setuptools to get the post-pip20 python tags by default

@YannickJadoul YannickJadoul deleted the tags-wheel-0.34 branch February 17, 2020 16:33
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants