FIX: work with PyQt 5.15 - #17600
Merged
Merged
Conversation
tacaswell
added
Release critical
Member
Author
|
I think this is actually unreleased change to sip, not PyQt / Qt. |
tacaswell
force-pushed
the
mnt_more_qt515_fixes
branch
from
June 9, 2020 21:47
53e5aac to
5070830
Compare
Member
Author
|
The travis webhooks are miss-behaving, the non-nightly tests passed but not being reflected back on github. |
QuLogic
approved these changes
Jun 10, 2020
QuLogic
left a comment
QuLogic
left a comment
Member
There was a problem hiding this comment.
Not certain about round vs int, but type-wise, this makes sense.
tacaswell
force-pushed
the
mnt_more_qt515_fixes
branch
from
June 15, 2020 19:20
5070830 to
a894f70
Compare
Two places where we used to pass floats that must now be integers.
tacaswell
force-pushed
the
mnt_more_qt515_fixes
branch
from
June 15, 2020 19:39
a894f70 to
3eca034
Compare
jklymak
approved these changes
Jun 15, 2020
|
Owee, I'm MrMeeseeks, Look at me. There seem to be a conflict, please backport manually. Here are approximate instructions:
And apply the correct labels and milestones. Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon! If these instruction are inaccurate, feel free to suggest an improvement. |
tacaswell
pushed a commit
to tacaswell/matplotlib
that referenced
this pull request
Jun 16, 2020
Merge pull request matplotlib#17600 from tacaswell/mnt_more_qt515_fixes FIX: work with PyQt 5.15 Conflicts: lib/matplotlib/backends/backend_qt5.py - on this branch the blitting code is still in backend_qt5agg.py
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
3 participants
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.
PR Summary
Two places where we used to pass floats that must now be integers.
This is to support PyQt 5.15.0