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: work with PyQt 5.15#17600

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
jklymak merged 1 commit intomatplotlib:masterfromtacaswell:mnt_more_qt515_fixes
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

@tacaswelltacaswell added Release criticalFor bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. GUI: Qt labelsJun 9, 2020
@tacaswelltacaswell added this to thev3.2.2 milestoneJun 9, 2020
@tacaswell
Copy link
MemberAuthor

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

@tacaswell
Copy link
MemberAuthor

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

Copy link
Member

@QuLogicQuLogic 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 aboutround vsint, but type-wise, this makes sense.

Two places where we used to pass floats that must now be integers.
@jklymakjklymak merged commit1686a5a intomatplotlib:masterJun 15, 2020
@lumberbot-app
Copy link

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 tosuggest an improvement.

@tacaswelltacaswell deleted the mnt_more_qt515_fixes branchJune 16, 2020 00:19
tacaswell pushed a commit to tacaswell/matplotlib that referenced this pull requestJun 16, 2020
Merge pull requestmatplotlib#17600 from tacaswell/mnt_more_qt515_fixesFIX: work with PyQt 5.15Conflicts:lib/matplotlib/backends/backend_qt5.py          - on this branch the blitting code is still in            backend_qt5agg.py
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@QuLogicQuLogicQuLogic approved these changes

@jklymakjklymakjklymak approved these changes

Assignees
No one assigned
Labels
GUI: QtRelease criticalFor 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
[8]ページ先頭
©2009-2025 Movatter.jp