Bump s3fs to 2021.08.00 by phofl · Pull Request #48299 · pandas-dev/pandas (original) (raw)

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 1.5.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 6559eda304d9a8b23e52043c6b540b0302d9ca20

1. You will likely have some merge/cherry-pick conflict here, fix them and commit:

git commit -am 'Backport PR #48299: Bump s3fs to 2021.08.00'

1. Push to a named branch:

git push YOURFORK 1.5.x:auto-backport-of-pr-48299-on-1.5.x

1. Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #48299 on branch 1.5.x (Bump s3fs to 2021.08.00)"

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.