Skip to content
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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: work with PyQt 5.15 #17600

Merged
merged 1 commit into from
Jun 15, 2020
Merged

FIX: work with PyQt 5.15 #17600

merged 1 commit into from
Jun 15, 2020

Conversation

tacaswell
Copy link
Member

PR Summary

Two places where we used to pass floats that must now be integers.

This is to support PyQt 5.15.0

@tacaswell tacaswell added Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. GUI: Qt labels Jun 9, 2020
@tacaswell tacaswell added this to the v3.2.2 milestone Jun 9, 2020
@tacaswell
Copy link
Member Author

I think this is actually unreleased change to sip, not PyQt / Qt.

@tacaswell
Copy link
Member Author

The travis webhooks are miss-behaving, the non-nightly tests passed but not being reflected back on github.

QuLogic
QuLogic approved these changes Jun 10, 2020
View reviewed changes
Copy link
Member

@QuLogic QuLogic left a comment

Choose a reason for hiding this comment

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

Not certain about round vs int, but type-wise, this makes sense.

@tacaswell
FIX: work with future versions of sip / pyqt5
3eca034 
Two places where we used to pass floats that must now be integers.
@jklymak jklymak merged commit 1686a5a into matplotlib:master Jun 15, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Jun 15, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v3.2.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 1686a5aa5995fbe6fef44d7f2f7c847b1ac1fd5f
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #17600: FIX: work with PyQt 5.15'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-17600-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #17600 on branch v3.2.x"

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 tacaswell deleted the mnt_more_qt515_fixes branch June 16, 2020 00:19
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull request Jun 16, 2020
@jklymak @tacaswell
Backport PR matplotlib#17600: FIX: work with PyQt 5.15
c12c4ff 
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@QuLogic QuLogic QuLogic approved these changes

@jklymak jklymak jklymak approved these changes

Assignees
No one assigned
Labels
GUI: Qt Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Milestone
v3.2.2
Development

Successfully merging this pull request may close these issues.
3 participants
@tacaswell @QuLogic @jklymak