Skip to content

CI: Fix pyreadstat upgrade change #55653

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

Merged
merged 1 commit into from
Oct 23, 2023
Merged

Conversation

phofl
Copy link
Member

@phofl phofl commented Oct 23, 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 CI Continuous Integration Dependencies Required and optional dependencies labels Oct 23, 2023
@phofl phofl added this to the 2.1.2 milestone Oct 23, 2023
@mroeschke mroeschke merged commit 0de3bcb into pandas-dev:main Oct 23, 2023
@mroeschke
Copy link
Member

Thanks @phofl

@lumberbot-app
Copy link

lumberbot-app bot commented Oct 23, 2023

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.1.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 0de3bcbcb5bf3010173d478f4c327e4defcbe6b2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #55653: CI: Fix pyreadstat upgrade change'
  1. Push to a named branch:
git push YOURFORK 2.1.x:auto-backport-of-pr-55653-on-2.1.x
  1. Create a PR against branch 2.1.x, I would have named this PR:

"Backport PR #55653 on branch 2.1.x (CI: Fix pyreadstat upgrade change)"

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
Member

IIRC this is a 2.2 feature so this may not need a backport

@phofl phofl deleted the pyreadstat_upgrade branch October 24, 2023 19:50
@phofl
Copy link
Member Author

phofl commented Oct 24, 2023

even better

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration Dependencies Required and optional dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants