Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix inversion of shared axes. #14598

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

Merged
merged 1 commit into from
Jun 25, 2019
Merged

Conversation

anntzer
Copy link
Contributor

@anntzer anntzer commented Jun 21, 2019

set_view_interval does not update shared axes, we must use
set_xlim/set_ylim to do so.

Update a test to explicitly invert an axis instead of relying on imshow
to implicitly do so.

Fix a regression due to #13330.

PR Summary

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

@anntzer anntzer added the Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions. label Jun 21, 2019
@anntzer anntzer added this to the v3.1.1 milestone Jun 21, 2019
@efiring
Copy link
Member

efiring commented Jun 25, 2019

@ivanov I don't think you really wanted to do that commit, did you? We don't normally merge master into a branch. Was a rebase needed instead?

@ivanov
Copy link
Member

ivanov commented Jun 25, 2019

thanks for catching that, Eric, indeed I went in to merge not realizing that a rebase was needed. Then I wasn't sure how my GitHub UI conflict resolution was going to be reflected back in git land. Should I rebase and force push to this branch @anntzer's original commits, omitting mine?

@ivanov
Copy link
Member

ivanov commented Jun 25, 2019

if there was a place to put down a different commit message to the conflict resolution, I missed it.

@efiring
Copy link
Member

efiring commented Jun 25, 2019

Yes, I think that should work. Pull to a local branch, rebase to keep just the original commit, and force-push back here should be OK. I'm not a git wizard, though.
Or you could wait for Antony to handle it.

set_view_interval does not update shared axes, we must use
set_xlim/set_ylim to do so.

Update a test to explicitly invert an axis instead of relying on imshow
to implicitly do so.
@anntzer
Copy link
Contributor Author

anntzer commented Jun 25, 2019

The rebase looks fine? I don't think I have to do anything at that point?

@tacaswell
Copy link
Member

Github's "resolve conflict" method is merge (which if I were given a choice of what to implement in a webUI it would be merge not rebase...).

@tacaswell tacaswell merged commit 5c413df into matplotlib:master Jun 25, 2019
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jun 25, 2019
@anntzer anntzer deleted the invertshared branch June 25, 2019 11:35
ivanov added a commit that referenced this pull request Jun 27, 2019
…598-on-v3.1.x

Backport PR #14598 on branch v3.1.x (Fix inversion of shared axes.)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Release critical For bugs that make the library unusable (segfaults, incorrect plots, etc) and major regressions.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants