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

BUG: Fix bug in putmask for CoW #50630

Merged

phofl merged 5 commits into pandas-dev:main from phofl:cow_putmask

Jan 13, 2023

Member

phofl commented Jan 8, 2023 •

edited

Loading

closes #xxxx (Replace xxxx with the GitHub issue number)
Tests added and passed if fixing a bug or adding a new feature
All code checks passed.
Added type annotations to new arguments/methods/functions.
Added an entry in the latest doc/source/whatsnew/vX.X.X.rst file if fixing a bug or adding a new feature.

cc @jorisvandenbossche this did not work an 1.5.2

phofl added 2 commits

January 8, 2023 16:07


          BUG: Fix bug in putmask for CoW


          Add whatsnew and gh ref

a40cec3

phofl added this to the 1.5.3 milestone

phofl added the Copy / view semantics label


          Merge branch 'main' into cow_putmask

bdde4df

Member Author

phofl commented Jan 11, 2023

cc @jorisvandenbossche Could you have a quick look? Ideally this would go into 1.5.3

phofl and others added 2 commits

January 12, 2023 17:00


          Merge branch 'main' into cow_putmask

00c0f12


          Merge remote-tracking branch 'upstream/main' into cow_putmask_2

3d70cf9

# Conflicts:
#	pandas/tests/copy_view/test_methods.py

phofl force-pushed the cow_putmask branch from 8f1c1a5 to 3d70cf9 Compare

January 12, 2023 21:34

mroeschke approved these changes

View reviewed changes

Member

mroeschke left a comment

LGTM

phofl merged commit 954cf55 into pandas-dev:main

phofl deleted the cow_putmask branch

January 13, 2023 08:21

lumberbot-app bot commented Jan 13, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

Checkout backport branch and update it.

git checkout 1.5.x
git pull

Cherry pick the first parent branch of the this PR on top of the older branch:

git cherry-pick -x -m1 954cf55938c50e34ddeced408d04bd04651eb96a

You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #50630: BUG: Fix bug in putmask for CoW'

Push to a named branch:

git push YOURFORK 1.5.x:auto-backport-of-pr-50630-on-1.5.x

Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #50630 on branch 1.5.x (BUG: Fix bug in putmask for CoW)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

lumberbot-app bot added the Still Needs Manual Backport label

phofl added a commit to phofl/pandas that referenced this pull request


          BUG: Fix bug in putmask for CoW (pandas-dev#50630)

421310f

phofl mentioned this pull request

Backport PR #50630 on branch 1.5.x (BUG: Fix bug in putmask for CoW) #50726

Merged

phofl removed the Still Needs Manual Backport label

Member

jorisvandenbossche commented Jan 13, 2023

Should we backport #50675 as well?

Member

jorisvandenbossche commented Jan 13, 2023

Ah, forget what I said, the usage of using_copy_on_write is in the internals itself, so there it is fine as is.

Member Author

phofl commented Jan 13, 2023

Puuuuh, is there anything else that is scheduled for 1.5.3 regarding CoW? If not, I wouldn't backport I think

Member Author

phofl commented Jan 13, 2023

Good :)

phofl added a commit that referenced this pull request


          Backport PR #50685 on branch 1.5.x (BUG: Fix bug in putmask for CoW) (#…

23a2699

…50726)

BUG: Fix bug in putmask for CoW (#50630)

phofl added a commit to phofl/pandas that referenced this pull request


          BUG: Fix bug in putmask for CoW (pandas-dev#50630)

dfbaba2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment