Skip to content

Conversation

@lithomas1
Copy link
Contributor

  • 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.
@lithomas1 lithomas1 requested a review from mroeschke as a code owner April 10, 2024 14:29
@lithomas1 lithomas1 added the CI Continuous Integration label Apr 10, 2024
@lithomas1 lithomas1 added this to the 2.2.2 milestone Apr 10, 2024
@lithomas1 lithomas1 merged commit b1525c4 into pandas-dev:main Apr 10, 2024
@lithomas1 lithomas1 deleted the fix-ci branch April 10, 2024 15:36
@lithomas1
Copy link
Contributor Author

self merging to make CI green.

@lumberbot-app
Copy link

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

"Backport PR #58209 on branch 2.2.x (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.

@maxnoe
Copy link

maxnoe commented Apr 11, 2024

Upstream fixed this now, this should be reverted to not cause issues in future

lithomas1 added a commit that referenced this pull request Apr 11, 2024
mroeschke pushed a commit that referenced this pull request Apr 11, 2024
Revert "CI: Pin blosc to fix pytables (#58209)" This reverts commit b1525c4.
pmhatre1 pushed a commit to pmhatre1/pandas-pmhatre1 that referenced this pull request May 7, 2024
* CI: Pin blosc to fix pytables * remove from requirements-dev.txt
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.
WillAyd pushed a commit to WillAyd/pandas that referenced this pull request Aug 15, 2024
Revert "CI: Pin blosc to fix pytables (pandas-dev#58209)" This reverts commit b1525c4.
WillAyd pushed a commit to WillAyd/pandas that referenced this pull request Aug 15, 2024
Revert "CI: Pin blosc to fix pytables (pandas-dev#58209)" This reverts commit b1525c4.
WillAyd pushed a commit to WillAyd/pandas that referenced this pull request Aug 22, 2024
Revert "CI: Pin blosc to fix pytables (pandas-dev#58209)" This reverts commit b1525c4.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI Continuous Integration

2 participants