Skip to content

CI: Use regular solver for docker build #50341

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

Merged
merged 1 commit into from
Dec 19, 2022
Merged

Conversation

phofl
Copy link
Member

@phofl phofl commented Dec 19, 2022

  • 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.3 milestone Dec 19, 2022
@phofl phofl added the CI Continuous Integration label Dec 19, 2022
@phofl
Copy link
Member Author

phofl commented Dec 19, 2022

Newest numpy and numba are incompatible, so the docker build fails without taking dependencies into account

@phofl phofl added the Dependencies Required and optional dependencies label Dec 19, 2022
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

@MarcoGorelli MarcoGorelli merged commit 083d030 into pandas-dev:main Dec 19, 2022
@lumberbot-app
Copy link

lumberbot-app bot commented Dec 19, 2022

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 083d030d473260456dabd7d4fd924830e557d97a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #50341: CI: Use regular solver for docker build'
  1. Push to a named branch:
git push YOURFORK 1.5.x:auto-backport-of-pr-50341-on-1.5.x
  1. Create a PR against branch 1.5.x, I would have named this PR:

"Backport PR #50341 on branch 1.5.x (CI: Use regular solver for docker build)"

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.

@MarcoGorelli
Copy link
Member

the dockerfile in 1.5.x is very different, does this need backporting?

@phofl
Copy link
Member Author

phofl commented Dec 19, 2022

Wasn't aware of that, are we using mamba there? If yes, then we don't have to backport

@MarcoGorelli
Copy link
Member

yup

@phofl phofl modified the milestones: 1.5.3, 2.0 Dec 19, 2022
@MarcoGorelli
Copy link
Member

we've backported the docker changes, so let's backport this too

@meeseeksdev please backport to 1.5.x

meeseeksmachine pushed a commit to meeseeksmachine/pandas that referenced this pull request Dec 23, 2022
@phofl phofl deleted the docker branch December 23, 2022 21:47
MarcoGorelli pushed a commit that referenced this pull request Dec 23, 2022
… build) (#50422)

Backport PR #50341: CI: Use regular solver for docker build

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
CI Continuous Integration Dependencies Required and optional dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants