Skip to content

Fix make_swiss_roll docstring to resolve a copyright ambiguity #31646

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

Conversation

ogrisel
Copy link
Member

@ogrisel ogrisel commented Jun 24, 2025

Fixes #31390.

See: #31390 (comment)

@ogrisel ogrisel changed the title Fix make_swiss_roll docstring to resolve a copyright ambiguity Fix make_swiss_roll docstring to resolve a copyright ambiguity Jun 24, 2025
Copy link

github-actions bot commented Jun 24, 2025

✔️ Linting Passed

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

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

Copy link
Member

@virchan virchan 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, @ogrisel!

@lorentzenchr lorentzenchr enabled auto-merge (squash) June 24, 2025 20:22
@lorentzenchr
Copy link
Member

Did we or github change something? I can’t merge as long as CI is not green.

@virchan
Copy link
Member

virchan commented Jun 24, 2025

The CI failure is being tracked in #31624. @lesteve is already investigating it.

@lorentzenchr
Copy link
Member

The point is that I should be able to merge even with failing CI (at least in the past that was possible).

@lesteve
Copy link
Member

lesteve commented Jun 25, 2025

The point is that I should be able to merge even with failing CI (at least in the past that was possible).

Required checks have been added some time ago (edit: December 2022) to enable auto-merge feature. If one of the required checks fail you can not merge. For more details see #25069. @lorentzenchr you even gave me a maintainability award about it in #25069 (comment) 😉.

Unfortunately right now we are in a very atypical and rare situation where CI is broken for every PRs (Windows is timing out on all PRs for some not fully understood reason but that seems link with MKL on a particular AMD CPU 😓) but there is hope to have a work-around soonish to get back to normal in #31641.

@lorentzenchr
Copy link
Member

Thanks @lesteve for the explanation. I had the impression (also the experience?) that it was possible to manually merge with CI failures, just not auto-merge.
Let's wait for the fixes - and maybe revive the maintainability award 😏

@lorentzenchr lorentzenchr merged commit ba954b7 into scikit-learn:main Jun 26, 2025
36 checks passed
@lesteve
Copy link
Member

lesteve commented Jun 26, 2025

The mechanism is the same for a human or auto-merge, if a required check is not passing, the PR can not be merged.

I double-checked, the required checks for main are listed in https://github.com/scikit-learn/scikit-learn/settings/branch_protection_rules/23621449 and right now there is only Azure and the changelog check.

image

I am pretty sure we used to have CircleCI but maybe we removed it at one point and forgot to add it back (vaguely rings a bell because there was a temporary CircleCI issue?). We should also add the linux arm64 tests that run on GHA ...

Here was the setting when it was originally set up #25069 (comment).

@ogrisel ogrisel deleted the fix-swiss-roll-copyright-statement branch June 30, 2025 12:47
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.

Contains code not allowed for commercial use
4 participants