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.

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

FIX: check we have a back button in tk toolbar before we touch it #18235

Merged
merged 1 commit into from Aug 13, 2020

Conversation

tacaswell
Copy link
Member

PR Summary

We add one by default, but sub-classes may remove it.

closes #18232

PR Checklist

  • Has Pytest style unit tests
  • Code is Flake 8 compliant

We add one by default, but sub-classes may remove it.

closes matplotlib#18232
@tacaswell tacaswell added this to the v3.3.1 milestone Aug 12, 2020
@QuLogic QuLogic merged commit 0375315 into matplotlib:master Aug 13, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Aug 13, 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.3.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 03753154ef2d555bc2badfc75defa62b653fe30c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #18235: FIX: check we have a back button in tk toolbar before we touch it'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-18235-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #18235 on branch v3.3.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.

QuLogic added a commit to QuLogic/matplotlib that referenced this pull request Aug 13, 2020
tacaswell added a commit that referenced this pull request Aug 13, 2020
@tacaswell tacaswell deleted the tk_no_back_button branch May 6, 2021 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

different behaviour between 3.3.0 and 3.2.2 (and earlier) for ploting in a Tk canvas
3 participants