/matplotlib

Drop conditional import of figureoptions. #6599

Merged
merged 2 commits into from Jun 18, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
GUI/Qt
Projects
None yet
Milestone
  v2.0.0
5 participants
@anntzer @tacaswell @jenshnielsen @mdboom @QuLogic
@anntzer
Contributor

anntzer commented Jun 17, 2016

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.

mdboom added the needs_review label Jun 17, 2016

tacaswell added this to the 2.1 (next point release) milestone Jun 17, 2016

@tacaswell
Owner

tacaswell commented Jun 17, 2016

👍 , but it looks like the doc failure is real and caused by this change.
@anntzer
Contributor

anntzer commented Jun 17, 2016

Do you know what's the version of Qt used on Travis? I couldn't find a reference to it.
@jenshnielsen
Owner

jenshnielsen commented Jun 17, 2016

As far as I remember travis mocks out qt when building the docs
@anntzer
Contributor

anntzer commented Jun 17, 2016

This may explain why QtGui appears as a "type object" rather than a module in the traceback.
Do you have a pointer as to how the mocking is done?
@tacaswell
Owner

tacaswell commented Jun 17, 2016

It is done in conf.py https://github.com/matplotlib/matplotlib/blob/master/doc/conf.py#L328

anntzer added some commits Jun 17, 2016

@anntzer anntzer Drop conditional import of figureoptions. 
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.

All checks have failed

3 failing checks
continuous-integration/appveyor/pr — AppVeyor build failed
Details
continuous-integration/travis-ci/pr — The Travis CI build failed
Details
coverage/coveralls — Coverage decreased (-0.002%) to 70.262%
Details
4c60022
@anntzer anntzer Mock the entire PyQt4.QtGui classes API.

All checks have passed

3 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
coverage/coveralls — Coverage increased (+0.0005%) to 70.265%
Details
a44839c

@tacaswell tacaswell merged commit 6b1adfd into matplotlib:master Jun 18, 2016
3 checks passed

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.0005%) to 70.265%
Details

tacaswell removed the needs_review label Jun 18, 2016

tacaswell referenced this pull request Jun 18, 2016

Open

Register figureoptions edits in views history. #6598

anntzer deleted the anntzer:always-figureoptions branch Jun 18, 2016

anntzer added the GUI/Qt label Jul 10, 2016

anntzer referenced this pull request Jul 10, 2016

Merged

Backport qt editor improvements #6718

@QuLogic QuLogic modified the milestone: 2.0 (style change major release), 2.1 (next point release) Jul 10, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment