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

Updating with 7.3.0 release #1

Merged
merged 3 commits into from
Jan 9, 2020
Merged

Updating with 7.3.0 release #1

merged 3 commits into from
Jan 9, 2020

Conversation

YannickJadoul
Copy link
Contributor

Temporary, locally-built test version available at https://hub.docker.com/r/yannickjadoul/manylinux2010-pypy_x86_64

The main non-straightforward thing is the extra pypy -> pypy3 symlink that was necessary, since the new PyPy releases don't provide it, but portable-pypy did.

version of PyPy. You can probably ignore them.
- ``pypy_73`` and ``pypy36_pp73`` (or before PyPy 7.3.0, ``pypy_41`` and
``pypy3_71``) are the binary ABI tags for the relevant version of PyPy.
You can probably ignore them.
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be helpful to rephrase this in terms of "python tags" and "ABI tags". The python tag is controlled by pip/setuptools and is unfortunately pp271/pp272/pp273/pp371/pp372/pp373, it should be pp27 or pp36 (only the python version, not the pypy 71/72/73 version). The ABI tag is pypy_41/pypy_73/pypy3_71/pypy3_72/pypy36_pp73.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Happy to change this, but you know a lot more about it and might be better at phrasing it. Feel free to push some changes to my branch/fork, before merging this PR.

Copy link
Member

Choose a reason for hiding this comment

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

Probably best to let it go as-is, since anyhow the next version of pip should change the python tag, making a mess of whatever exists now. Luckily there are not that many pypy-specific wheels out there yet

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Does that mean it would be a good idea to withhold merging/releasing pypa/cibuildwheel#185 for now, until the pip/setuptools gets changed/fixed?

Copy link
Member

Choose a reason for hiding this comment

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

I don't know. The source of the tag creation is https://github.com/pypa/packaging. The version at HEAD in that repo is not the same as version 19.0 which is currently vendored into pip https://github.com/pypa/pip/tree/master/src/pip/_vendor/packaging. I assume the idea is that packaging 20 (to be released) will be the one used in pip 20 (to be released) but I am not sure. I wanted to get 7.3.0 out (with the new ABI tags) before they release pip20, which I think will be some time in Jan 2020.

The 19.0 one in pip now shows these tags that start with `pp` (ignoring the cpython ones `cp*`: ```bash $ ../pypy2-HEAD/bin/pypy -c"from packaging.tags import sys_tags; print('\n'.join([str(s) for s in sys_tags() if str(s).startswith('pp')]))" pp273-pypy_73-manylinux2014_x86_64 pp273-pypy_73-manylinux2010_x86_64 pp273-pypy_73-manylinux1_x86_64 pp273-pypy_73-linux_x86_64 pp273-none-manylinux2014_x86_64 pp273-none-manylinux2010_x86_64 pp273-none-manylinux1_x86_64 pp273-none-linux_x86_64 pp273-none-any

$ ../pypy3.6-HEAD/bin/pypy3 -c"from packaging.tags import sys_tags;
print('\n'.join([str(s) for s in sys_tags() if str(s).startswith('pp')]))"
pp373-pypy36_pp73-manylinux2014_x86_64
pp373-pypy36_pp73-manylinux2010_x86_64
pp373-pypy36_pp73-manylinux1_x86_64
pp373-pypy36_pp73-linux_x86_64
pp373-none-manylinux2014_x86_64
pp373-none-manylinux2010_x86_64
pp373-none-manylinux1_x86_64
pp373-none-linux_x86_64
pp373-none-any


The new HEAD version shows
```bash
$ ../pypy2-HEAD/bin/pypy -c"from packaging.tags import sys_tags;
           print('\n'.join([str(s) for s in sys_tags() if str(s).startswith('pp')]))"
pp27-pypy_73-manylinux2014_x86_64
pp27-pypy_73-manylinux2010_x86_64
pp27-pypy_73-manylinux1_x86_64
pp27-pypy_73-linux_x86_64
pp27-none-manylinux2014_x86_64
pp27-none-manylinux2010_x86_64
pp27-none-manylinux1_x86_64
pp27-none-linux_x86_64

$ ../pypy3.6-HEAD/bin/pypy3 -c"from packaging.tags import sys_tags; 
         print('\n'.join([str(s) for s in sys_tags() if str(s).startswith('pp')]))"
pp36-pypy36_pp73-manylinux2014_x86_64
pp36-pypy36_pp73-manylinux2010_x86_64
pp36-pypy36_pp73-manylinux1_x86_64
pp36-pypy36_pp73-linux_x86_64
pp36-none-manylinux2014_x86_64
pp36-none-manylinux2010_x86_64
pp36-none-manylinux1_x86_64
pp36-none-linux_x86_64

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, great; thank you for that! It's good to know, if tests soon start failing.

(Also makes me a bit happier that I chose the shortened pp27_73-manylinux_pypy_x86_64 and pp36_73-manylinux_pypy_x86_64 build identifiers for cibuildwheel :-) )

if [ ! -f "$outdir/bin/pypy" ]; then
ln -s pypy3 $outdir/bin/pypy
fi

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I guess this is something we should do in the packaging script.

Copy link

Choose a reason for hiding this comment

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

Unless it was intentionally so so one can unpack both 2.7 and 3.x in the same directory without clashes...

@mattip
Copy link
Member

mattip commented Dec 26, 2019

LGTM. A few small nits, but this can probably go in as-is and we can tweak the text that no-one reads later. @antocuni should I merge it?

@antocuni
Copy link
Member

LGTM. A few small nits, but this can probably go in as-is and we can tweak the text that no-one reads later. @antocuni should I merge it?

@mattip LGTM as well. You are the one who know best about the new portable release of PyPy, so if you think it's good please merge it :)

Copy link

@dejlek dejlek left a comment

Choose a reason for hiding this comment

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

Looks good.

@antocuni antocuni merged commit 42c879e into pypy:master Jan 9, 2020
@antocuni antocuni mentioned this pull request Jan 9, 2020
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.

4 participants