X Tutup
Skip to content

FIX: make sure scalarmappable updates are handled correctly in 3D#18929

Merged
QuLogic merged 4 commits intomatplotlib:masterfrom
tacaswell:fix_3D_scatter
Nov 11, 2020
Merged

FIX: make sure scalarmappable updates are handled correctly in 3D#18929
QuLogic merged 4 commits intomatplotlib:masterfrom
tacaswell:fix_3D_scatter

Conversation

@tacaswell
Copy link
Copy Markdown
Member

@tacaswell tacaswell commented Nov 10, 2020 •
edited
Loading

PR Summary

Code from a debugging session on the phone with @QuLogic

PR Checklist

  • Has pytest style unit tests (and pytest passes).
  • Is Flake 8 compliant (run flake8 on changed files to check).
  • New features are documented, with examples if plot related.
  • Documentation is sphinx and numpydoc compliant (the docs should build without error).
  • Conforms to Matplotlib style conventions (install flake8-docstrings and run flake8 --docstring-convention=all).
  • New features have an entry in doc/users/next_whats_new/ (follow instructions in README.rst there).
  • API changes documented in doc/api/next_api_changes/ (follow instructions in README.rst there).

@tacaswell tacaswell requested a review from QuLogic November 10, 2020 21:54
@tacaswell tacaswell added this to the v3.3.3 milestone Nov 10, 2020
@tacaswell tacaswell force-pushed the fix_3D_scatter branch 2 times, most recently from 1036193 to c9c0d38 Compare November 10, 2020 22:04
@QuLogic
Copy link
Copy Markdown
Member

QuLogic commented Nov 11, 2020

I don't think you want to rename attributes that way, as #18592 is going to do the opposite.

QuLogic
QuLogic requested changes Nov 11, 2020
View reviewed changes
Copy link
Copy Markdown
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.

Revert renames, due to the above comment. Also, unmark draft?

@tacaswell
Copy link
Copy Markdown
Member Author

tacaswell commented Nov 11, 2020

I did the renames because the 3D collections were inconsistent between each other. I pushed to plural to match the 2D version, will push them the other way.

@tacaswell tacaswell requested a review from QuLogic November 11, 2020 04:13
@tacaswell tacaswell marked this pull request as ready for review November 11, 2020 04:13
This was referenced Nov 11, 2020
Closed
Closed
@tacaswell
Copy link
Copy Markdown
Member Author

tacaswell commented Nov 11, 2020

Because we have a shortage of people to review mplot3D, this being a critical bug, and in the interest of getting 3.3.3 out @QuLogic can merge this at his discretion on a single review.

QuLogic
QuLogic reviewed Nov 11, 2020
View reviewed changes
Copy link
Copy Markdown
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.

Plus flake8 issues.

tacaswell and others added 2 commits November 11, 2020 14:35
@tacaswell @QuLogic
DOC: fix formatting and typos
d58647b 
Co-authored-by: Elliott Sales de Andrade <quantum.analyst@gmail.com>
@tacaswell
STY: fix line length
2bbe60a
@QuLogic QuLogic changed the title FIX: make sure scalarmappable updates are handleded correctly in 3D FIX: make sure scalarmappable updates are handled correctly in 3D Nov 11, 2020
@QuLogic QuLogic merged commit fa54783 into matplotlib:master Nov 11, 2020
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app bot commented Nov 11, 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 fa547835c7ea262b706f8bdde5bb7433ccef4f79
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #18929: FIX: make sure scalarmappable updates are handled correctly in 3D'
  1. Push to a named branch :
git push YOURFORK v3.3.x:auto-backport-of-pr-18929-on-v3.3.x
  1. Create a PR against branch v3.3.x, I would have named this PR:

"Backport PR #18929 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 Nov 11, 2020
@QuLogic
Backport PR matplotlib#18929: FIX: make sure scalarmappable updates a…
f679026 
…re handled correctly in 3D
@QuLogic QuLogic mentioned this pull request Nov 11, 2020
Closed
tacaswell added a commit that referenced this pull request Nov 11, 2020
@tacaswell
Merge pull request #18936 from QuLogic/auto-backport-of-pr-18929-on-v…
3dc7152 
…3.3.x

Backport PR #18929 on branch v3.3.x
@ivirshup ivirshup mentioned this pull request Nov 12, 2020
Closed
@tacaswell tacaswell deleted the fix_3D_scatter branch May 6, 2021 23:04
@tacaswell tacaswell restored the fix_3D_scatter branch May 6, 2021 23:04
@tacaswell tacaswell deleted the fix_3D_scatter branch May 6, 2021 23:04
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

Assignees

No one assigned

Labels

topic: mplot3d

Projects

None yet

Milestone

v3.3.3

Development

Successfully merging this pull request may close these issues.

2 participants

@tacaswell @QuLogic
X Tutup