Skip to content

MAINT Update conda lock to 2.5.6 #28653

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 2 commits into from
Mar 18, 2024
Merged

Conversation

lesteve
Copy link
Member

@lesteve lesteve commented Mar 18, 2024

Update to last conda-lock release mid-March 2024.

The scipy-dev lock-file has more updates since there has been issues on the scipy-dev for a while and the lock-file were not updated for a while see #28459.

Closes #28459.

Copy link

✔️ Linting Passed

All linting checks passed. Your pull request is in excellent shape! ☀️

Generated for commit: ff1e525. Link to the linter CI: here

Copy link
Member

@ogrisel ogrisel left a comment

Choose a reason for hiding this comment

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

LGTM assuming the last CI build (PyPy) goes through.

@lesteve
Copy link
Member Author

lesteve commented Mar 18, 2024

Note the PyPy lock-file diff is only an input_hash change: https://github.com/scikit-learn/scikit-learn/pull/28653/files#diff-7c97cc402c4464afe0867a628403fd7271b8a9c3487df2654c7f8ed684b919f8.

The PyPy build may time out, as it sometimes does, but I think this PR can be merged anyway (with an auto-merge + commit push without [pypy]).

@ogrisel
Copy link
Member

ogrisel commented Mar 18, 2024

I agree. Let me mark the current commit as auto-merge as it's already 87% progress. If it ever times out, +1 for what you suggest.

@ogrisel ogrisel enabled auto-merge (squash) March 18, 2024 15:01
@ogrisel ogrisel merged commit 974d579 into scikit-learn:main Mar 18, 2024
@lesteve lesteve deleted the update-conda-lock branch March 18, 2024 15:52
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