Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Download qhull at build-or-sdist time.#16720

Merged
jklymak merged 4 commits into
matplotlib:masterfrom
anntzer:dqh
Jan 15, 2021
Merged

Download qhull at build-or-sdist time.#16720
jklymak merged 4 commits into
matplotlib:masterfrom
anntzer:dqh

Conversation

@anntzer
Copy link
Copy Markdown
Contributor

@anntzer anntzer commented Mar 10, 2020

PR Summary

As suggested in #16571 (comment).

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant
  • New features are documented, with examples if plot related
  • Documentation is sphinx and numpydoc compliant
  • Added an entry to doc/users/next_whats_new/ if major new feature (follow instructions in README.rst there)
  • Documented in doc/api/api_changes.rst if API changed in a backward-incompatible way

@anntzer anntzer added the Build label Mar 10, 2020
@anntzer anntzer mentioned this pull request Mar 10, 2020
Closed
@tacaswell tacaswell changed the title Download jquery at build-or-sdist time. Download qhull at build-or-sdist time. Mar 10, 2020
@tacaswell
Copy link
Copy Markdown
Member

tacaswell commented Mar 10, 2020

I change the PR title, but the commit message is still miss leading.

tacaswell
tacaswell previously requested changes Mar 10, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@tacaswell tacaswell left a comment

Choose a reason for hiding this comment

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

👍 in principle.

Please fix the commit message, anyone can clear this review once that is done.

@tacaswell tacaswell added this to the v3.3.0 milestone Mar 10, 2020
@anntzer
Copy link
Copy Markdown
Contributor Author

anntzer commented Mar 10, 2020

oops, fixed.

@dstansby dstansby requested a review from ianthomas23 March 16, 2020 21:21
@QuLogic QuLogic mentioned this pull request Apr 8, 2020
Closed
@QuLogic QuLogic modified the milestones: v3.3.0, v3.4.0 May 5, 2020
@anntzer anntzer mentioned this pull request Jan 5, 2021
Closed
@anntzer
Copy link
Copy Markdown
Contributor Author

anntzer commented Jan 6, 2021

rebased to use qhull 2020.2. @ianthomas23 feel free to force-push over the last PR to become recorded as author; I copy pasted your qhull_wrap.c from #16571 but couldn't cherry pick the commit as that change was not standalone.

@anntzer anntzer force-pushed the dqh branch 2 times, most recently from 3fc40dc to 06c7808 Compare January 6, 2021 12:36
@timhoffm
Copy link
Copy Markdown
Member

timhoffm commented Jan 7, 2021

@anntzer for your information: You can acknowledge other authors via the commit message:
https://docs.github.com/en/free-pro-team@latest/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors#creating-co-authored-commits-on-the-command-line

@anntzer
Copy link
Copy Markdown
Contributor Author

anntzer commented Jan 7, 2021

nice, thanks.

@ianthomas23
Copy link
Copy Markdown
Member

ianthomas23 commented Jan 7, 2021

@ianthomas23 feel free to force-push over the last PR to become recorded as author; I copy pasted your qhull_wrap.c from #16571 but couldn't cherry pick the commit as that change was not standalone.

@anntzer I was thinking that if my name isn't on it, I can't be blamed if anything goes wrong with it in future! But it looks like you have already credited/blamed me 😃

ianthomas23
ianthomas23 reviewed Jan 7, 2021
View reviewed changes
Comment thread lib/matplotlib/tests/test_triangulation.py
@ianthomas23
Copy link
Copy Markdown
Member

ianthomas23 commented Jan 7, 2021

Do we need to consider what to do with qhull's licence file (COPYING.txt)? We used to keep a copy in the extern directory with the source code, but if we are downloading the code on demand I don't know if a static copy is required or not.

@anntzer
Copy link
Copy Markdown
Contributor Author

anntzer commented Jan 7, 2021

I'll let @tacaswell decide on the legal stuff :)

@QuLogic
Copy link
Copy Markdown
Member

QuLogic commented Jan 7, 2021

It will be built into the wheels, so we need to keep the license. Clause 2 says you must provide the license for any copies, so we should copy it into LICENSE/ either permanently or on unpack.

@anntzer
Copy link
Copy Markdown
Contributor Author

anntzer commented Jan 8, 2021 •
edited
Loading

I now copy the license on unpack, and also just unified the codepaths with the freetype download/cache codepath.

ianthomas23
ianthomas23 reviewed Jan 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ianthomas23 ianthomas23 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I am happy with this from a functional point of view as all triangulation tests perform as expected, and the license file is unpacked into the LICENSE directory. I have just one documentation nitpick and there are some test failures but I think some of these are just timeouts.

Comment thread INSTALL.rst Outdated
@anntzer @ianthomas23
Switch to reentrant qhull 2020 8.0.2.
dbe44f8 
(the current version)

Co-authored-by: Ian Thomas <[email protected]>
ianthomas23
ianthomas23 approved these changes Jan 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@ianthomas23 ianthomas23 left a comment

Choose a reason for hiding this comment

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

Although this wasn't my favoured approach, it does fix the problem and I don't want to hold it up any longer. I am happy for it to be merged.

timhoffm
timhoffm reviewed Jan 12, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@timhoffm timhoffm 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. Slightly better naming/documentation possible.

Comment thread setupext.py
Comment thread setupext.py
timhoffm
timhoffm reviewed Jan 14, 2021
View reviewed changes
Comment thread setupext.py
Comment thread setupext.py
@jklymak
Copy link
Copy Markdown
Member

jklymak commented Jan 15, 2021

The test failures are spurious I think...

@jklymak jklymak merged commit 33ef669 into matplotlib:master Jan 15, 2021
@anntzer anntzer deleted the dqh branch January 15, 2021 17:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ianthomas23 ianthomas23 ianthomas23 approved these changes

@timhoffm timhoffm timhoffm approved these changes

@tacaswell tacaswell tacaswell left review comments

Assignees

No one assigned

Labels

Build

Projects

None yet

Milestone

v3.4.0

Development

Successfully merging this pull request may close these issues.

6 participants

@anntzer @tacaswell @timhoffm @ianthomas23 @QuLogic @jklymak