Don't work out packages to install if user requests information from setup.p #7538
Conversation
|
I suspect that this conflicts with #7530 , would you mind rebasing? |
|
Approval is obviously conditional on fixing the merge conflicts. |
…tion from setup.py
7ad9109 to
b9cdc41
Compare
|
That should be rebased now |
Current coverage is 61.88% (diff: 100%)@@ master #7538 diff @@
==========================================
Files 173 173
Lines 56140 56140
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 34743 34743
Misses 21397 21397
Partials 0 0
|
|
Side note, if you look at https://github.com/matplotlib/matplotlib/pull/7538/files?w=1 to see that this diff is mostly indentation changes. |
|
Neat, I didn't know about that feature! |
| # If the user just queries for information, don't bother figuring out which | ||
| # packages to build or install. | ||
| if (any('--' + opt in sys.argv for opt in | ||
| Distribution.display_option_names + ['help']) or |
There was a problem hiding this comment.
This line should be indented one more so as to not coincide with the code indent in the block. But even so, it should be indented anyway because it's within the any(.
There was a problem hiding this comment.
Woops, sorry for missing that. Should be fixed now.
|
#7056 is milestoned 2.0.1; should we really be backporting this one? |
|
@QuLogic no, bumped the OP to 2.1. |
|
Ah, I wish GH notified when an issue I opened is referenced from another issue/PR. Thanks for fixing this! |
Should fix #7056 - this seemed like the neatest way to avoid working out packages to install.