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

CI: Pin openpyxl to < 3.1.1 #51391

Merged
merged 1 commit into from
Feb 15, 2023
Merged

CI: Pin openpyxl to < 3.1.1 #51391

merged 1 commit into from
Feb 15, 2023

Conversation

phofl
Copy link
Member

@phofl phofl commented Feb 14, 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 this to the 1.5.4 milestone Feb 14, 2023
Copy link
Member

@MarcoGorelli MarcoGorelli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @phofl

@phofl phofl merged commit 0e12bfc into pandas-dev:main Feb 15, 2023
@lumberbot-app
Copy link

lumberbot-app bot commented Feb 15, 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 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 0e12bfcd4b4d4e6f5ebe6cc6f99c0a5836df4478
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #51391: CI: Pin openpyxl to < 3.1.1'
  1. Push to a named branch:
git push YOURFORK 1.5.x:auto-backport-of-pr-51391-on-1.5.x
  1. Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #51391 on branch 1.5.x (CI: Pin openpyxl to < 3.1.1)"

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.

@phofl phofl deleted the ci_pin_openpyxl branch February 15, 2023 18:02
MarcoGorelli pushed a commit to MarcoGorelli/pandas that referenced this pull request Feb 15, 2023
MarcoGorelli added a commit that referenced this pull request Feb 16, 2023
)

Backport PR #51391: CI: Pin openpyxl to < 3.1.1

Co-authored-by: Patrick Hoefler <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants