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

Inform setuptools that Extensions are included #643

Merged
merged 5 commits into from
Dec 11, 2023

Conversation

jakirkham
Copy link
Member

Fixes #641

As setuptools/pip/wheel will mark our package as pure (even though we put an extension module into it), make sure it doesn't by informing setuptools that Extensions are contained within. This should ensure that are wheels include the Python minor version they were built for.

@jakirkham jakirkham added bug Something isn't working non-breaking Introduces a non-breaking change labels Nov 29, 2023
Ensure `setuptools` knows our package has extension modules. Even though
it is not totally obvious they are there.
@jakirkham jakirkham force-pushed the mark_bdist_whl_impure branch from a2506af to 07e2ed2 Compare November 29, 2023 03:09
@jakirkham
Copy link
Member Author

This works! 🎉

Final name from CI:

./cucim_cu11-23.12.0a21-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl

Copy link
Contributor

@grlee77 grlee77 left a comment

Choose a reason for hiding this comment

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

Thanks, John. This looks good! I guess this may be preferable to renaming after the fact as in #644.

@jakirkham
Copy link
Member Author

Based on offline discussion, we decided to go with PR ( #644 ) as it is a publicly documented API that is most consistent with how the build works

Longer term we might want to use scikit-build ( #645 ), which would make this unnecessary

@jakirkham jakirkham closed this Nov 29, 2023
@jakirkham jakirkham deleted the mark_bdist_whl_impure branch November 29, 2023 18:59
@jakirkham jakirkham restored the mark_bdist_whl_impure branch December 8, 2023 20:50
@jakirkham jakirkham reopened this Dec 8, 2023
This reverts commit 12ec30b.

Doing this because `wheel tags` adds an additional `Root-Is-Purelib`
field to `*.dist-info/WHEEL` without removing the previous one, which
causes the wheel to fail checks.
@jakirkham jakirkham marked this pull request as ready for review December 8, 2023 20:54
@jakirkham jakirkham requested review from a team as code owners December 8, 2023 20:54
@jakirkham
Copy link
Member Author

Turns out wheel tags adds a new Root-Is-Purelib field to *.dist-info/WHEEL without removing the old one, which leaves the metadata in an invalid state:

$ grep 'Root-Is-Purelib' cucim_cu11-23.12.0.dist-info/WHEEL
Root-Is-Purelib: true
Root-Is-Purelib: False

So reviving this alternative approach and reverting the wheel tags change

Copy link
Contributor

@vyasr vyasr left a comment

Choose a reason for hiding this comment

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

To unblock the release, can we also add (or symlink) the license into python/cucim?
Running ln -s ../../LICENSE in the python/cucim directory should do it (unless we need the 3rd party license, I don't know, but symlink that one instead if needed).

@jakirkham
Copy link
Member Author

Good catch. Went ahead and symlinked both and updated pyproject.toml to list both

@jakirkham jakirkham force-pushed the mark_bdist_whl_impure branch from 76ef188 to e7f7d74 Compare December 8, 2023 21:34
@jakirkham jakirkham force-pushed the mark_bdist_whl_impure branch from e7f7d74 to 96630be Compare December 8, 2023 22:07
@raydouglass raydouglass merged commit 23e3f1c into rapidsai:branch-23.12 Dec 11, 2023
38 of 39 checks passed
@jakirkham jakirkham mentioned this pull request Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

23.12 nightly wheels missing Python minor version
5 participants