Skip to content
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.

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

Add pypy3.7 7.3.5 #1103

Merged
merged 1 commit into from
May 23, 2021
Merged

Add pypy3.7 7.3.5 #1103

merged 1 commit into from
May 23, 2021

Conversation

mayeut
Copy link
Member

@mayeut mayeut commented May 22, 2021

Fix #1099

@mayeut mayeut requested review from henryiii and YannickJadoul May 22, 2021 09:45
@mayeut
Copy link
Member Author

mayeut commented May 22, 2021

@mattip, could you review this PR please ?

LINK_VERSION=$(pip${PYVERS} -V)
REAL_VERSION=$(${PYTHON} -m pip -V)
test "${LINK_VERSION%% from *}" = "${REAL_VERSION%% from *}"
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't these sanity checks be run on PyPy too? If they fail there is a problem with the PyPy build ...

Copy link
Member Author

Choose a reason for hiding this comment

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

can't run the sanity check of the pipx.y symlink in /usr/local/bin since there are no symlink for PyPy pip in there. As mentioned in an earlier comment, going to remove those anyway.

For sqlite3, this is specific to cpython being rebuilt from source with a specific version (well should be specific, this has been an issue before). Given PyPY comes as a full featured binary, this check isn't right (& fails because the embedded sqlite3 is version 3.28 or 3.29 - I don't remember exactly)

Copy link
Contributor

Choose a reason for hiding this comment

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

the embedded sqlite3 is version 3.28 or 3.29

Hmm. Is it documented somewhere what sqlite3 a specific python version expects? If cpython is statically linking to 3.35 that would suggest PyPy should as well.

Copy link
Member Author

Choose a reason for hiding this comment

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

The minimum sqlite3 version required by cpython is fairly low: https://github.com/python/cpython/blob/220dd80a2671f57486055955d5422163cf73ed33/Modules/_sqlite/module.c#L33

The default version in manylinux1 was even older than this requirement though:

It's been updated since then in order not to get issue reported because of CVE on older versions.

Windows/macOS installers of CPython also update sqlite3 regularly as noted in their release notes.

@mattip
Copy link
Contributor

mattip commented May 22, 2021

Thanks. I plan on releasing PyPy 7.3.5 in the next two days, so maybe merge only after that is released and can be used here?

@mayeut
Copy link
Member Author

mayeut commented May 23, 2021

Thanks. I plan on releasing PyPy 7.3.5 in the next two days, so maybe merge only after that is released and can be used here?

Seems like a good plan.
Converted back to draft until updated to 7.3.5 to prevent this PR from being merged.
I'll also look into checking sha256 sums for downloaded packages.

@mayeut mayeut changed the title Add pypy3.7 7.3.4 Add pypy3.7 7.3.5 May 23, 2021
@mattip
Copy link
Contributor

mattip commented May 23, 2021

PyPy 3.7.5 has been released. The checksums are available at https://www.pypy.org/checksums.html

@mayeut mayeut marked this pull request as ready for review May 23, 2021 11:36
@mattip
Copy link
Contributor

mattip commented May 23, 2021

Is there a way to test that this is working?

@mayeut
Copy link
Member Author

mayeut commented May 23, 2021

Is there a way to test that this is working?

The tests in the manylinux repo are really minimal & PR images aren't uploaded anywhere.
All I can say is that it passes the same minimal tests as cpython here (mostly, we can install packages with pip and ssl connections are working properly).
I'll merge this once Travis CI is green to get some more tests running in pypa/cibuildwheel#671

@mayeut mayeut merged commit b4fb34d into pypa:master May 23, 2021
@mayeut mayeut deleted the pypy branch May 23, 2021 18:03
Copy link
Member

@YannickJadoul YannickJadoul left a comment

Choose a reason for hiding this comment

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

Sorry for the delay, @mayeut. I don't know the manylinux images that well, but yeah, this PR seems to make sense to me :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add PyPy?
4 participants