Skip to content

Adjust merge tests for new string option#56445

Merged
mroeschke merged 9 commits intopandas-dev:mainfrom
phofl:merge_tests
Jan 17, 2024
Merged

Adjust merge tests for new string option#56445
mroeschke merged 9 commits intopandas-dev:mainfrom
phofl:merge_tests

Conversation

@phofl
Copy link
Copy Markdown
Member

@phofl phofl commented Dec 11, 2023

  • 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.

@phofl phofl added this to the 2.2 milestone Dec 11, 2023
@phofl phofl added the Strings String extension data type and string data label Dec 11, 2023
@mroeschke
Copy link
Copy Markdown
Member

mroeschke commented Jan 10, 2024

Could you merge in main here once more? I think the precursor PR was merged already

@mroeschke mroeschke merged commit 9e0b655 into pandas-dev:main Jan 17, 2024
@lumberbot-app
Copy link
Copy Markdown

lumberbot-app Bot commented Jan 17, 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.2.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 9e0b6556b77b554f43067d06057dd05c6e8b8dc4
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #56445: Adjust merge tests for new string option'
  1. Push to a named branch:
git push YOURFORK 2.2.x:auto-backport-of-pr-56445-on-2.2.x
  1. Create a PR against branch 2.2.x, I would have named this PR:

"Backport PR #56445 on branch 2.2.x (Adjust merge tests for new string option)"

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.

@mroeschke
Copy link
Copy Markdown
Member

mroeschke commented Jan 17, 2024

Thanks @phofl

lithomas1 pushed a commit to lithomas1/pandas that referenced this pull request Jan 18, 2024
@phofl @lithomas1
Backport PR pandas-dev#56445: Adjust merge tests for new string option
d9e7db2
@lithomas1 lithomas1 mentioned this pull request Jan 18, 2024
Merged
5 tasks
lithomas1 added a commit that referenced this pull request Jan 18, 2024
@lithomas1 @phofl
Backport PR #56445: Adjust merge tests for new string option (#56938)
74fa740 
Co-authored-by: Patrick Hoefler <61934744+phofl@users.noreply.github.com>
pmhatre1 pushed a commit to pmhatre1/pandas-pmhatre1 that referenced this pull request May 7, 2024
@phofl @lithomas1 @pmhatre1
Adjust merge tests for new string option (pandas-dev#56445)
cd42d1e 
* BUG: merge not raising for String and numeric merges

* BUG: merge not sorting for new string dtype

* Add coverage

* Fixup tests

* Update

---------

Co-authored-by: Thomas Li <47963215+lithomas1@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mroeschke mroeschke mroeschke approved these changes

Assignees

No one assigned

Labels

Strings String extension data type and string data

Projects

None yet

Milestone

2.2

Development

Successfully merging this pull request may close these issues.

3 participants

@phofl @mroeschke @lithomas1