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

BUG: merge not sorting for new string dtype #56442

Merged
merged 8 commits into from Jan 9, 2024

Conversation

phofl
Copy link
Member

@phofl phofl commented Dec 10, 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 10, 2023
@phofl phofl requested a review from mroeschke December 15, 2023 22:45
@mroeschke mroeschke added Reshaping Concat, Merge/Join, Stack/Unstack, Explode Strings String extension data type and string data Arrow pyarrow functionality labels Dec 18, 2023
@phofl
Copy link
Member Author

phofl commented Jan 6, 2024

cc @mroeschke I'd like to get this into 2.2

@mroeschke
Copy link
Member

pre-commit.ci autofix

@phofl
Copy link
Member Author

phofl commented Jan 8, 2024

green now

@mroeschke
Copy link
Member

Oops merge conflict otherwise looks good

@mroeschke mroeschke merged commit b7e2202 into pandas-dev:main Jan 9, 2024
48 of 50 checks passed
@mroeschke
Copy link
Member

Thanks @phofl

Copy link

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

"Backport PR #56442 on branch 2.2.x (BUG: merge not sorting for new string dtype)"

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.

@phofl phofl deleted the merge_sort branch January 9, 2024 08:42
phofl added a commit to phofl/pandas that referenced this pull request Jan 9, 2024
* BUG: merge not sorting for new string dtype

* Fixup

* Update test_multi.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

(cherry picked from commit b7e2202)
mroeschke pushed a commit that referenced this pull request Jan 9, 2024
…ing dtype) (#56799)

BUG: merge not sorting for new string dtype (#56442)

* BUG: merge not sorting for new string dtype

* Fixup

* Update test_multi.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

(cherry picked from commit b7e2202)
pmhatre1 pushed a commit to pmhatre1/pandas-pmhatre1 that referenced this pull request May 7, 2024
* BUG: merge not sorting for new string dtype

* Fixup

* Update test_multi.py

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Arrow pyarrow functionality Reshaping Concat, Merge/Join, Stack/Unstack, Explode Strings String extension data type and string data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants