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 Update lock files for scipy-dev CI build(s) 🔒 🤖 #30260

Conversation

scikit-learn-bot
Copy link
Contributor

Update lock files.

Note

If the CI tasks fail, create a new branch based on this PR and add the required fixes to that branch.

@scikit-learn-bot scikit-learn-bot force-pushed the auto-update-lock-files-scipy-dev branch from 8942528 to 9022602 Compare November 11, 2024 05:02
Copy link

github-actions bot commented Nov 11, 2024

✔️ Linting Passed

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

Generated for commit: 7311bdf. Link to the linter CI: here

@lesteve
Copy link
Member

lesteve commented Nov 12, 2024

For some reason I can't seem to merge this one I get an error "Merge attempt failed, Merge already in progress".

image

@jeremiedbb
Copy link
Member

yeah I keep getting the same message as well.

jeremiedbb pushed a commit to scikit-learn-bot/scikit-learn that referenced this pull request Nov 12, 2024
@jeremiedbb jeremiedbb enabled auto-merge (squash) November 12, 2024 12:03
@lesteve lesteve disabled auto-merge November 12, 2024 12:19
@lesteve
Copy link
Member

lesteve commented Nov 12, 2024

Weird the diff is now empty and actually from the main branch history, it does seem like this PR was merged (one hour ago so I guess probably when @jeremiedbb clicked the merge button the first time):
image

I unset auto-merge, I guess we can close this one ...

@lesteve lesteve closed this Nov 12, 2024
jeremiedbb pushed a commit to glemaitre/scikit-learn that referenced this pull request Nov 14, 2024
jeremiedbb pushed a commit that referenced this pull request Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants