Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Fix shims with PyQt5 5.11#11500

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
timhoffm merged 2 commits intomatplotlib:masterfromQuLogic:qt5.11
Jul 3, 2018
Merged

Conversation

QuLogic
Copy link
Member

@QuLogicQuLogic commentedJun 24, 2018•
edited
Loading

PR Summary

Fix import of PyQt5 5.11.

sip is not really required by this code when using PyQt5, and 5.11 now no longer requires it nor provides it globally [1].

Also, move the PyQt/PySide shim bits to the end to be near the Qt5/Qt4 shim.

[1]http://pyqt.sourceforge.net/Docs/PyQt5/incompatibilities.html#pyqt-v5-11

Remove unnecessary Qt signal connection.

This fails with PyQt5.11, but is also unnecessary._destroying is set to True before this signal is connected, so the callback simply returns immediately. Thus, just remove the connection entirely.

PR Checklist

  • Has Pytest style unit tests
  • Code is PEP 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

sip is not really required by this code when using PyQt5, and 5.11 nowno longer requires it nor provides it globally [1].Also, move the PyQt/PySide shim bits to the end to be near the Qt5/Qt4shim.[1]http://pyqt.sourceforge.net/Docs/PyQt5/incompatibilities.html#pyqt-v5-11
This fails with PyQt5.11, but is also unnecessary. `_destroying` is setto True before this signal is connected, so the callback simply returnsimmediately. Thus, just remove the connection entirely.
Copy link
Contributor

@anntzeranntzer left a comment

Choose a reason for hiding this comment

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

LGTM (the latest pyqt5 release was actually buggy and has been withdrawn, seehttps://www.riverbankcomputing.com/pipermail/pyqt/2018-June/040459.html, so the build is now unbroken and this can wait for a second reviewer; but in general the PR still looks good).

@anntzer
Copy link
Contributor

Restarted the build to check with the new release of PyQt5.11.

Copy link
Member

@jklymakjklymak left a comment

Choose a reason for hiding this comment

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

This passes the tests, so fixes the QT error all the Travis tests are having...

@timhoffmtimhoffm merged commit2fc375b intomatplotlib:masterJul 3, 2018
@jklymak
Copy link
Member

Let the rebasing begin! Thanks@QuLogic and@anntzer

@tacaswell
Copy link
Member

@meeseeksdev backport to v2.2.x

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

@anntzeranntzeranntzer approved these changes

@jklymakjklymakjklymak approved these changes

@timhoffmtimhoffmtimhoffm approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.2.3
Development

Successfully merging this pull request may close these issues.

5 participants
@QuLogic@anntzer@jklymak@tacaswell@timhoffm
[8]ページ先頭
©2009-2025 Movatter.jp