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

Skip to content

FIX: Keep lists of lists of one scalar each 2D in _reshape_2D #17821

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 1 commit into from
Jul 2, 2020
Merged

FIX: Keep lists of lists of one scalar each 2D in _reshape_2D #17821

merged 1 commit into from
Jul 2, 2020
+10 −2

Conversation

alexhenrie
Copy link
Contributor

This fixes a regression introduced by commit ac018af.

Closes #17820

@alexhenrie
FIX: Keep lists of lists of one scalar each 2D in _reshape_2D
41bf4ea 
This fixes a regression introduced by commit
ac018af.

Closes #17820
@dstansby dstansby added this to the v3.2.3 milestone Jul 2, 2020
@dstansby dstansby merged commit 8e7c7ab into matplotlib:master Jul 2, 2020
@dstansby dstansby modified the milestones: v3.2.3, v3.3.0 Jul 2, 2020
@lumberbot-app
Copy link

lumberbot-app bot commented Jul 2, 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.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 8e7c7ab096d8b424745bdcd9d45cea515c1c7b9a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #17821: FIX: Keep lists of lists of one scalar each 2D in _reshape_2D'
  1. Push to a named branch :
git push YOURFORK v3.2.x:auto-backport-of-pr-17821-on-v3.2.x
  1. Create a PR against branch v3.2.x, I would have named this PR:

"Backport PR #17821 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 to suggest an improvement.

@dstansby
Copy link
Member

dstansby commented Jul 2, 2020

@meeseeksdev backport to v3.3.x

@meeseeksmachine meeseeksmachine mentioned this pull request Jul 2, 2020
Merged
meeseeksmachine pushed a commit to meeseeksmachine/matplotlib that referenced this pull request Jul 2, 2020
@dstansby @meeseeksmachine
Backport PR matplotlib#17821: FIX: Keep lists of lists of one scalar …
57708cb 
…each 2D in _reshape_2D
QuLogic added a commit that referenced this pull request Jul 2, 2020
@QuLogic
Merge pull request #17823 from meeseeksmachine/auto-backport-of-pr-17…
e90d2ae 
…821-on-v3.3.x

Backport PR #17821 on branch v3.3.x (FIX: Keep lists of lists of one scalar each 2D in _reshape_2D)
@alexhenrie alexhenrie deleted the reshape branch July 6, 2020 22:47
@jklymak jklymak mentioned this pull request Aug 13, 2020
Closed
@jakevdp jakevdp mentioned this pull request Dec 20, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timhoffm timhoffm timhoffm approved these changes

@dstansby dstansby dstansby approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v3.3.0
Development

Successfully merging this pull request may close these issues.

Regression: _reshape_2D no longer preserves the shape of lists of lists of one scalar each
3 participants
@alexhenrie @dstansby @timhoffm