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

BLD: Pre-download Qhull license to put in wheels #25364

Merged
merged 1 commit into from Mar 3, 2023

Conversation

QuLogic
Copy link
Member

@QuLogic QuLogic commented Mar 2, 2023

PR Summary

We couldn't work out what exactly changed to stop the license being included, so work around that by pre-downloading it.

Fixes #25212

PR Checklist

Documentation and Tests

  • [n/a] Has pytest style unit tests (and pytest passes)
  • [n/a] Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • [n/a] New plotting related features are documented with examples.

Release Notes

  • [n/a] New features are marked with a .. versionadded:: directive in the docstring and documented in doc/users/next_whats_new/
  • [n/a] API changes are marked with a .. versionchanged:: directive in the docstring and documented in doc/api/next_api_changes/
  • [n/a] Release notes conform with instructions in next_whats_new/README.rst or next_api_changes/README.rst

@QuLogic QuLogic added the CI: Run cibuildwheel Run wheel building tests on a PR label Mar 2, 2023
@QuLogic QuLogic added this to the v3.7.1 milestone Mar 2, 2023
@QuLogic QuLogic force-pushed the wheel-license branch 2 times, most recently from a12eaf3 to 184460f Compare March 2, 2023 08:50
We couldn't work out what exactly changed to stop the license being
included, so work around that by pre-downloading it.

Fixes matplotlib#25212
@QuLogic
Copy link
Member Author

QuLogic commented Mar 2, 2023

Results are:

$ for f in *.whl; do echo $f; unzip -l $f | rg LICENSE_QHULL; done
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-macosx_10_12_universal2.whl
     1720  03-02-2023 09:31   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-macosx_10_12_x86_64.whl
     1720  03-02-2023 09:21   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-macosx_11_0_arm64.whl
     1720  03-02-2023 09:25   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
     1720  03-02-2023 09:41   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-manylinux_2_17_i686.manylinux2014_i686.whl
     1720  03-02-2023 09:19   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
     1720  03-02-2023 09:12   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-win32.whl
     1720  03-02-2023 09:09   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp310-cp310-win_amd64.whl
     1720  03-02-2023 09:11   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-macosx_10_12_universal2.whl
     1720  03-02-2023 09:17   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-macosx_10_12_x86_64.whl
     1720  03-02-2023 09:07   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-macosx_11_0_arm64.whl
     1720  03-02-2023 09:11   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
     1720  03-02-2023 09:20   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-manylinux_2_17_i686.manylinux2014_i686.whl
     1720  03-02-2023 09:10   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
     1720  03-02-2023 09:02   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-win32.whl
     1720  03-02-2023 09:05   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp311-cp311-win_amd64.whl
     1720  03-02-2023 09:07   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-macosx_10_12_universal2.whl
     1720  03-02-2023 09:45   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-macosx_10_12_x86_64.whl
     1720  03-02-2023 09:35   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-macosx_11_0_arm64.whl
     1720  03-02-2023 09:39   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl
     1720  03-02-2023 10:01   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-manylinux_2_17_i686.manylinux2014_i686.whl
     1720  03-02-2023 09:23   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
     1720  03-02-2023 09:21   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-win32.whl
     1720  03-02-2023 09:13   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-cp39-cp39-win_amd64.whl
     1720  03-02-2023 09:15   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-pp39-pypy39_pp73-macosx_10_12_x86_64.whl
     1720  03-02-2023 09:55   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-pp39-pypy39_pp73-manylinux_2_17_i686.manylinux2014_i686.whl
     1720  03-02-2023 09:35   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
     1720  03-02-2023 09:29   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL
matplotlib-3.8.0.dev476+gdea999191f-pp39-pypy39_pp73-win_amd64.whl
     1720  03-02-2023 09:24   matplotlib-3.8.0.dev476+gdea999191f.dist-info/LICENSE_QHULL

@ksunden ksunden merged commit 981e1d1 into matplotlib:main Mar 3, 2023
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Mar 3, 2023
oscargus added a commit that referenced this pull request Mar 3, 2023
…364-on-v3.7.x

Backport PR #25364 on branch v3.7.x (BLD: Pre-download Qhull license to put in wheels)
@QuLogic QuLogic deleted the wheel-license branch March 3, 2023 21:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI: Run cibuildwheel Run wheel building tests on a PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: LICENSE_QHULL is included in wheel only the second time
3 participants