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

Ensure policies in policy.json are compliant with PEP600 #287

Merged
merged 2 commits into from
Feb 28, 2021

Conversation

mayeut
Copy link
Member

@mayeut mayeut commented Feb 18, 2021

This also removes 2 non existing symbols from manylinux1 i686 policy and removes ncurses librairies from manylinux1 whitelist.

Now that PEP600 supersedes previous manylinux PEPs, it should be enforced:

When this PEP is accepted, the previous manylinux PEPs will receive a final update noting that they are no longer maintained and referring to this PEP.

Fix #286

This removes 2 non existing symbols from manylinux1 i686 policy and removes ncurses librairies from manylinux1 whitelist.
@codecov
Copy link

codecov bot commented Feb 18, 2021

Codecov Report

Merging #287 (b452f14) into master (22c8451) will increase coverage by 1.60%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #287      +/-   ##
==========================================
+ Coverage   89.03%   90.63%   +1.60%     
==========================================
  Files          20       20              
  Lines        1058     1079      +21     
  Branches      226      232       +6     
==========================================
+ Hits          942      978      +36     
+ Misses         69       57      -12     
+ Partials       47       44       -3     
Impacted Files Coverage Δ
auditwheel/policy/__init__.py 100.00% <100.00%> (+1.85%) ⬆️
auditwheel/lddtree.py 92.90% <0.00%> (+0.70%) ⬆️
auditwheel/wheeltools.py 89.31% <0.00%> (+2.29%) ⬆️
auditwheel/policy/external_references.py 97.61% <0.00%> (+4.76%) ⬆️
auditwheel/main_addtag.py 86.84% <0.00%> (+21.05%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 22c8451...b452f14. Read the comment docs.

@mayeut mayeut requested a review from lkollar February 19, 2021 06:30
@mayeut mayeut mentioned this pull request Feb 20, 2021
@mayeut
Copy link
Member Author

mayeut commented Feb 21, 2021

Failure on TravisCI ppc64le is unrelated to the PR.

Copy link
Contributor

@lkollar lkollar 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, just one suggestion.

if policy['name'] == 'linux':
continue
if not lib_whitelist.issubset(set(policy['lib_whitelist'])):
raise ValueError('Invalid "policy.json" file')
Copy link
Contributor

Choose a reason for hiding this comment

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

How about making the string more explicit on what's wrong with the policy check? That could make it easier to diagnose the issue when editing the JSON.

Copy link
Member Author

Choose a reason for hiding this comment

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

I added more information and tests for that. Is that better now ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Great, thanks!

@mayeut mayeut merged commit 70e167d into pypa:master Feb 28, 2021
@mayeut mayeut deleted the enforce-pep600-policies branch February 28, 2021 19:38
@mayeut mayeut mentioned this pull request Apr 3, 2021
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.

ncurses 5 -> 6 transition means we probably need to drop some libraries from the manylinux whitelist
2 participants