8000 MNT update lock files by lesteve · Pull Request #25361 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

MNT update lock files #25361

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Jan 11, 2023
Merged

MNT update lock files #25361

merged 1 commit into from
Jan 11, 2023

Conversation

lesteve
Copy link
Member
@lesteve lesteve commented Jan 11, 2023

This works around issues seen in #25342 by install sphinx with conda.

See also conda/conda-lock#309 for the conda-lock issue.

@lesteve lesteve mentioned this pull request Jan 11, 2023
Merged
ogrisel
ogrisel approved these changes Jan 11, 2023
View reviewed changes
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 green CI.

jjerphan
jjerphan approved these changes Jan 11, 2023
View reviewed changes
Copy link
Member
@jjerphan jjerphan left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!
8000

@lesteve
Copy link
Member Author
lesteve commented Jan 11, 2023 •
edited
Loading

I double-checked that the scipy-dev failure were already in main, see this build log from main

@jjerphan
Copy link
Member

Merging then. Do you think we can regenerate those files easily for cython>=0.29.33 in #25342?

@jjerphan jjerphan merged commit 7d47190 into scikit-learn:main Jan 11, 2023
@lesteve lesteve deleted the update-lock-files branch January 11, 2023 16:38
glemaitre pushed a commit to glemaitre/scikit-learn that referenced this pull request Jan 12, 2023
@lesteve @glemaitre
MNT [scipy-dev] [pypy] [azure parallel] update lock files (scikit-lea…
9b2eb17 
…rn#25361)
@lesteve lesteve mentioned this pull request Jan 16, 2023
Merged
jjerphan pushed a commit to jjerphan/scikit-learn that referenced this pull request Jan 20, 2023
@lesteve @jjerphan
MNT [scipy-dev] [pypy] [azure parallel] update lock files (scikit-lea…
31de294 
…rn#25361)
jjerphan pushed a commit to jjerphan/scikit-learn that referenced this pull request Jan 20, 2023
@lesteve @jjerphan
MNT [scipy-dev] [pypy] [azure parallel] update lock files (scikit-lea…
940bab3 
…rn#25361)
jjerphan pushed a commit to jjerphan/scikit-learn that referenced this pull request Jan 23, 2023
@lesteve @jjerphan
MNT [scipy-dev] [pypy] [azure parallel] update lock files (scikit-lea…
4baa8ca 
…rn#25361)
adrinjalali pushed a commit that referenced this pull request Jan 24, 2023
@lesteve @adrinjalali
MNT [scipy-dev] [pypy] [azure parallel] update lock files (#25361)
d862205
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ogrisel ogrisel ogrisel approved these changes

@jjerphan jjerphan jjerphan approved these changes

Assignees
No one assigned
Labels
Build / CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lesteve @jjerphan @ogrisel
0