-
-
Notifications
You must be signed in to change notification settings - Fork 25.8k
MNT Pull main on feature/engine-api dev branch #26949
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
MNT Pull main on feature/engine-api dev branch #26949
Conversation
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz> Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
…t-learn#25548) Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
…arn#26019) Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com>
Co-authored-by: Jérémie du Boisberranger <34657725+jeremiedbb@users.noreply.github.com> Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
…n#26016) Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>
…rn#26124) Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com> Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
Co-authored-by: Olivier Grisel <olivier.grisel@ensta.org>
…entroid (scikit-learn#24083) Co-authored-by: Jérémie du Boisberranger <jeremiedbb@users.noreply.github.com> Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
…earn#25429) Co-authored-by: ArturoAmorQ <arturo.amor-quiroz@polytechnique.edu> Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com>
…ly (scikit-learn#15554) Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
…cikit-learn#26318) Co-authored-by: Guillaume Lemaitre <g.lemaitre58@gmail.com>
…26920) Co-authored-by: Adrin Jalali <adrin.jalali@gmail.com>
Co-authored-by: Adrin Jalali <adrin.jalali@gmail.com>
…-learn#26928) Co-authored-by: Thomas J. Fan <thomasjpfan@gmail.com>
…nto feature/engine-api
I don't think this PR belongs here. If you're trying to update your local branch, refer to https://scikit-learn.org/dev/developers/contributing.html#how-to-contribute |
This isn't a mistake, the branch https://github.com/scikit-learn/scikit-learn/tree/feature/engine-api has been moved from @ogrisel fork to scikit-learn main repo but I lost permissions to push on it in the process. |
This PR is adding more than 46k lines of code, no way we can review it. For feature branches, it's easier for the champion of the branch (I guess in this case @ogrisel ) to merge |
We haven't pulled main for several months because the project was slowed down, so now that I want to catch up there's 46k diff. I need the test pipelines to run so I can finalize the work. The review of the actual diff from feature/engine-api to main is expected to take place in #25535 . |
Thanks @adrinjalali |
Opened the PR for the CI to run, but I would rather not have this PR merged and once tests are okay, @ogrisel can merge |
@betatim could also merge this branch. I had a quick look because the 46K lines seem strange but it looks legit. |
What is the downside to using a PR based workflow (that targets the feature branch) to work around permission issues like Franck has? Maybe adding to the PR description that this is a work around for permission issues and other context would be useful for the future. I think we need a way for people like Franck to make progress on work even when all the core devs related to the feature branch are on holiday (for several weeks). And even when I'm not on holiday it is nice for Franck to be able to do stuff, instead of being blocked by when I/Olivier have time to get around to something. Maybe we can work out a way to achieve that. (I've not yet had time to look through all my GH notifications since going on holiday) |
At the pace we've been working on this branch lately it's not too much of an issue. For now my work on this branch is completed (fully tested with soda-inria/sklearn-numba-dpex#114 ) could you synchronize it with engine/feature-api please ? (merge or manually pull on engine/feature-api, as you wish) There were only a few minor conflicts in kmeans (with recent changes regarding sample_weight) + ruff compliance to catch on. |
The downside is that this came out of nowhere, with no context given on the PR description. So I genuinely thought it's a mistake / spam PR. And it's rebasing and including like 180 PRs or more. There's no way to review this.
When I worked on SLEP6, other people were working on it as well, but I made sure the branch is up to date whenever it needed to be. That's what I'd expect from you (@betatim ) or @ogrisel to do as well. And you not doing it in time doesn't block people from working on the feature since everybody can merge with But sure, if you wanna merge this into the feature branch go ahead. However, it would be nice if one of you handles these cases. |
Merging this for now. I agree that we need more context in the original message if we want to use this strategy in the future. |
What does this implement/fix? Explain your changes.
git pull --no-rebase origin main
onfeature/engine-api
branch with conflict resolution.