Skip to content
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

Revert "CI: Pin blosc to fix pytables" #58218

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Revert "CI: Pin blosc to fix pytables" #58218

merged 1 commit into from
Apr 11, 2024

Conversation

lithomas1
Copy link
Member

Reverts #58209

@lithomas1 lithomas1 added the CI Continuous Integration label Apr 11, 2024
@lithomas1 lithomas1 added this to the 2.2.3 milestone Apr 11, 2024
@mroeschke mroeschke merged commit 8b6a82f into main Apr 11, 2024
51 of 52 checks passed
@mroeschke mroeschke deleted the revert-58209-fix-ci branch April 11, 2024 15:21
@mroeschke
Copy link
Member

Thanks @lithomas1

Copy link

lumberbot-app bot commented Apr 11, 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 8b6a82f35a9dd8437564b50631b86b6a7e8c0251
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #58218: Revert "CI: Pin blosc to fix pytables"'
  1. Push to a named branch:
git push YOURFORK 2.2.x:auto-backport-of-pr-58218-on-2.2.x
  1. Create a PR against branch 2.2.x, I would have named this PR:

"Backport PR #58218 on branch 2.2.x (Revert "CI: Pin blosc to fix pytables")"

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.

pmhatre1 pushed a commit to pmhatre1/pandas-pmhatre1 that referenced this pull request May 7, 2024
Revert "CI: Pin blosc to fix pytables (pandas-dev#58209)"

This reverts commit b1525c4.
@simonjayhawkins
Copy link
Member

simonjayhawkins commented May 15, 2024

@lithomas1 was #58209 ever backported? We can remove the needs backport label here?

and change the milestones?

@lithomas1
Copy link
Member Author

This wasn't needed for 2.2.3.

Thanks for checking.

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

Successfully merging this pull request may close these issues.

None yet

3 participants