Drop conditional import of figureoptions.#6599
Merged
tacaswell merged 2 commits intomatplotlib:masterfrom Jun 18, 2016
Merged
Conversation
Member
|
👍 , but it looks like the doc failure is real and caused by this change. |
Contributor
Author
|
Do you know what's the version of Qt used on Travis? I couldn't find a reference to it. |
Member
|
As far as I remember travis mocks out qt when building the docs |
Contributor
Author
|
This may explain why QtGui appears as a "type object" rather than a module in the traceback. |
Member
|
It is done in conf.py https://github.com/matplotlib/matplotlib/blob/master/doc/conf.py#L328 |
As far as I can tell, the only way the import of figureoptions could fail is under PyQt 4.3 or earlier (QFormLayout was introduced in Qt 4.4). PyQt 4.4 was released in 2008 and the oldest version still downloadable on SourceForge seems to be 4.9, so that seems safe... Also up the version requirement on PyQt.
8b5be13 to
4c60022
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As far as I can tell, the only way the import of figureoptions could
fail is under PyQt 4.3 or earlier (QFormLayout was introduced in Qt
4.4). PyQt 4.4 was released in 2008 and the oldest version still
downloadable on SourceForge seems to be 4.9, so that seems safe...
Also up the version requirement on PyQt.