Skip to content
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

TST (string dtype): resolve xfails for frame fillna and replace tests + fix bug in replace for string #60295

Conversation

jorisvandenbossche
Copy link
Member

@jorisvandenbossche jorisvandenbossche commented Nov 13, 2024

Follow-up on #60285, fixing one additional bug in the string-fallback-to-object implementation, uncovered by enabling all other replace/fillna related tests.

xref #54792

@jorisvandenbossche jorisvandenbossche added Strings String extension data type and string data replace replace method labels Nov 13, 2024
@jorisvandenbossche jorisvandenbossche added this to the 2.3 milestone Nov 13, 2024
@jorisvandenbossche jorisvandenbossche marked this pull request as ready for review November 15, 2024 16:03
@mroeschke mroeschke merged commit fae3e80 into pandas-dev:main Nov 15, 2024
51 checks passed
@mroeschke
Copy link
Member

Thanks @jorisvandenbossche

Copy link

lumberbot-app bot commented Nov 15, 2024

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 2.3.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 fae3e8034faf66eb8ef00bcbed73d48e4ef791d3
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #60295: TST (string dtype): resolve xfails for frame fillna and replace tests + fix bug in replace for string'
  1. Push to a named branch:
git push YOURFORK 2.3.x:auto-backport-of-pr-60295-on-2.3.x
  1. Create a PR against branch 2.3.x, I would have named this PR:

"Backport PR #60295 on branch 2.3.x (TST (string dtype): resolve xfails for frame fillna and replace tests + fix bug in replace for string)"

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.

@jorisvandenbossche jorisvandenbossche deleted the string-dtype-tests-frame-replace-fillna branch November 15, 2024 19:57
jorisvandenbossche added a commit to jorisvandenbossche/pandas that referenced this pull request Nov 15, 2024
… + fix bug in replace for string (pandas-dev#60295)

(cherry picked from commit fae3e80)
@jorisvandenbossche
Copy link
Member Author

Manual backport -> #60331

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
replace replace method Strings String extension data type and string data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants