Closed WillAyd closed 1 week ago
Owee, I'm MrMeeseeks, Look at me.
There seem to be a conflict, please backport manually. Here are approximate instructions:
git checkout 2.3.x
git pull
Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 34c080cb91d71a8e900a6c114279e142924c1a64
You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #60337: CI: update fastparquet xfails for new release'
git push YOURFORK 2.3.x:auto-backport-of-pr-60337-on-2.3.x
"Backport PR #60337 on branch 2.3.x (CI: update fastparquet xfails for new release)"
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.
Manual backport -> https://github.com/pandas-dev/pandas/pull/60344
Looks like a new release just came out to fix this xfail