Skip to content

Conversation

jorisvandenbossche
Copy link
Member

I was initially planning to do just a PR to remove the warning on 2.3.x, but then thought that in the end all those changes would be needed on main as well.
This essentially reverts commit 809b97f (#55968)

See discussion in #57033

@mroeschke mroeschke merged commit 3085f9f into pandas-dev:main Sep 27, 2025
47 of 49 checks passed
@mroeschke
Copy link
Member

Thanks @jorisvandenbossche

Copy link

lumberbot-app bot commented Sep 27, 2025

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 3085f9ff8b4a6d11122e68f4de11b118c01d0701
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #62480: DEPR: remove the Period resampling deprecation'
  1. Push to a named branch:
git push YOURFORK 2.3.x:auto-backport-of-pr-62480-on-2.3.x
  1. Create a PR against branch 2.3.x, I would have named this PR:

"Backport PR #62480 on branch 2.3.x (DEPR: remove the Period resampling deprecation)"

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
Copy link
Member Author

Manual backport -> #62485

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Period Period data type Resample resample method
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants