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 (string dtype): fix qualifier in memory usage info #60221

Merged

Conversation

jorisvandenbossche
Copy link
Member

Ensuring the + qualifier in the memory usage is correct: we don't need it for the pyarrow-based string dtype, but still need it if it is object-dtype based.

xref #54792

@jorisvandenbossche jorisvandenbossche added the Strings String extension data type and string data label Nov 6, 2024
@jorisvandenbossche jorisvandenbossche added this to the 2.3 milestone Nov 6, 2024
@WillAyd WillAyd merged commit 0937c95 into pandas-dev:main Nov 7, 2024
51 checks passed
@WillAyd
Copy link
Member

WillAyd commented Nov 7, 2024

Thanks @jorisvandenbossche

Copy link

lumberbot-app bot commented Nov 7, 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 0937c95777d44462d67fd5b299d4563984e78332
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #60221: BUG (string dtype): fix qualifier in memory usage info'
  1. Push to a named branch:
git push YOURFORK 2.3.x:auto-backport-of-pr-60221-on-2.3.x
  1. Create a PR against branch 2.3.x, I would have named this PR:

"Backport PR #60221 on branch 2.3.x (BUG (string dtype): fix qualifier in memory usage info)"

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-memory-info-qualifier branch November 7, 2024 19:17
jorisvandenbossche added a commit to jorisvandenbossche/pandas that referenced this pull request Nov 7, 2024
@jorisvandenbossche
Copy link
Member Author

Manual backport -> #60231

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

Successfully merging this pull request may close these issues.

2 participants