Skip to content

FIX: continue to bail tight layout if rect supplied #13603

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
Merged
merged 2 commits into from
Mar 8, 2019
Merged

FIX: continue to bail tight layout if rect supplied #13603

merged 2 commits into from
Mar 8, 2019

Conversation

jklymak
Copy link
Member

@jklymak jklymak commented Mar 6, 2019 •
edited
Loading

PR Summary

We put in bail logic for tight layout but then continue to try and apply tight_layout if the rect argument is applied, and this crashes because kwargs is None at this point....

Closes #13600

PR Checklist

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

@jklymak jklymak added this to the v3.1.0 milestone Mar 6, 2019
@jklymak jklymak added topic: geometry manager LayoutEngine, Constrained layout, Tight layout Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. labels Mar 6, 2019
timhoffm
timhoffm approved these changes Mar 7, 2019
View reviewed changes
Copy link
Member

@timhoffm timhoffm left a comment

Choose a reason for hiding this comment

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

Can you easily add a text based on #13600?

@jklymak
Copy link
Member Author

jklymak commented Mar 7, 2019

Yes, sorry - got busy...

@jklymak
Copy link
Member Author

jklymak commented Mar 7, 2019

Modified test fails master:

           left, bottom, right, top = rect
            if left is not None:
>               left += kwargs["left"]
E               TypeError: 'NoneType' object is not subscriptable

but passes this PR...

@QuLogic QuLogic merged commit 22bbbae into matplotlib:master Mar 8, 2019
@lumberbot-app
Copy link

lumberbot-app bot commented Mar 8, 2019

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.1.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 22bbbae96aa7cbe1e69c5f6377e549095ec6fc8c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #13603: FIX: continue to bail tight layout if rect supplied'
  1. Push to a named branch :
git push YOURFORK v3.1.x:auto-backport-of-pr-13603-on-v3.1.x
  1. Create a PR against branch v3.1.x, I would have named this PR:

"Backport PR #13603 on branch v3.1.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 Mar 8, 2019
@QuLogic
Merge pull request matplotlib#13603 from jklymak/fix-bail-tight-layout
745c086 
FIX: continue to bail tight layout if rect supplied
@QuLogic
Copy link
Member

QuLogic commented Mar 8, 2019

Backport in #13628.

QuLogic added a commit that referenced this pull request Mar 8, 2019
@QuLogic
Merge pull request #13628 from QuLogic/backport-13603
3d0675b 
Backport PR #13603 on branch v3.1.x
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

@timhoffm timhoffm timhoffm approved these changes

Assignees
No one assigned
Labels
Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. topic: geometry manager LayoutEngine, Constrained layout, Tight layout
Projects
None yet
Milestone
v3.1.0
Development

Successfully merging this pull request may close these issues.

text in colorbar does not work correctly with tight layout
3 participants
@jklymak @QuLogic @timhoffm