Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

BUG: Remove np._get_promotion_state usage #59818

Merged
merged 4 commits into from
Sep 16, 2024
Merged

BUG: Remove np._get_promotion_state usage #59818

merged 4 commits into from
Sep 16, 2024

Conversation

lysnikolaou
Copy link
Contributor

@jorisvandenbossche jorisvandenbossche added this to the 2.2.3 milestone Sep 16, 2024
@jorisvandenbossche jorisvandenbossche added CI Continuous Integration Compat pandas objects compatability with Numpy or Python functions labels Sep 16, 2024
This was referenced Sep 16, 2024
Merged
Closed
jorisvandenbossche
jorisvandenbossche approved these changes Sep 16, 2024
View reviewed changes
Copy link
Member

@jorisvandenbossche jorisvandenbossche left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @lysnikolaou!

@jorisvandenbossche jorisvandenbossche merged commit 081dcde into pandas-dev:main Sep 16, 2024
47 checks passed
@lumberbot-app Lumberbot (App)
Copy link

lumberbot-app bot commented Sep 16, 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 081dcdee8d754af90e307cf2311b06b3d02fae2a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #59818: BUG: Remove np._get_promotion_state usage'
  1. Push to a named branch:
git push YOURFORK 2.2.x:auto-backport-of-pr-59818-on-2.2.x
  1. Create a PR against branch 2.2.x, I would have named this PR:

"Backport PR #59818 on branch 2.2.x (BUG: Remove np._get_promotion_state usage)"

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 pushed a commit to jorisvandenbossche/pandas that referenced this pull request Sep 16, 2024
@lysnikolaou @jorisvandenbossche
BUG: Remove np._get_promotion_state usage (pandas-dev#59818)
ebda120 
(cherry picked from commit 081dcde)
@jorisvandenbossche jorisvandenbossche mentioned this pull request Sep 16, 2024
Merged
jorisvandenbossche added a commit that referenced this pull request Sep 16, 2024
@jorisvandenbossche @lysnikolaou
Backport PR #59818 on branch 2.2.x (BUG: Remove np._get_promotion_sta…
e5a2067 
…te usage) (#59821)

BUG: Remove np._get_promotion_state usage (#59818)

(cherry picked from commit 081dcde)

Co-authored-by: Lysandros Nikolaou <lisandrosnik@gmail.com>
@jorisvandenbossche jorisvandenbossche mentioned this pull request Oct 31, 2024
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@jorisvandenbossche jorisvandenbossche jorisvandenbossche approved these changes

@mroeschke mroeschke Awaiting requested review from mroeschke

Assignees
No one assigned
Labels
CI Continuous Integration Compat pandas objects compatability with Numpy or Python functions
Projects
None yet
Milestone
2.2.3
Development

Successfully merging this pull request may close these issues.

No Python 3.13 wheels available in scientific-python-nightly-wheels
2 participants
@lysnikolaou @jorisvandenbossche