Added support for compiled cffi pypy extensions, fixes #93 #94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ehashman
reviewed
May 24, 2018
| module_init_f = { | ||
| 'init' + modname: 2, | ||
| 'PyInit_' + modname: 3, | ||
| '_cffi_pypyinit_' + modname: 2, |
There was a problem hiding this comment.
What are 2 and 3 in this context? We might want to change these to named constants for legibility :)
There was a problem hiding this comment.
Those are versions of Python used to determine if extension may use ucs-2 functions. Corresponding code is in auditwheel.wheel_abi.get_wheel_elfdata. In case of CPython those numbers are really Python version but in case if pypy cffi python version cannot be derived from the name of module init function so I left 2 there.
| @@ -113,7 +113,8 @@ def copylib(src_path, dest_dir): | |||
| with open(src_path, 'rb') as f: | |||
| shorthash = hashfile(f)[:8] | |||
|
|
|||
| base, ext = os.path.basename(src_path).split('.', 1) | |||
| src_name = os.path.basename(src_path) | |||
| base, ext = src_name.split('.', 1) | |||
There was a problem hiding this comment.
Ah, I see, this is a 2-for-1 to fix #91. Got it.
mayeut
pushed a commit
to mayeut/auditwheel
that referenced
this pull request
Jun 10, 2018
- Remove libpanel and libncurses from the lib_whitelist (pypa#94) - Generate symbol_versions - Bump priority to 200.
ehashman
approved these changes
Jul 3, 2018
ehashman
pushed a commit
that referenced
this pull request
Nov 18, 2018
- Remove libpanel and libncurses from the lib_whitelist (#94) - Generate symbol_versions - Bump priority to 200.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As said in corresponding issue CFFI extensions compiled for PyPy export
'_cffi_pypyinit_' + modnamesymbol instead of usual Python module init functions, this pull request adds support for such wheels. Also by the way it fixes undefined variable mentioned in #91.