✔️ Linting Passed

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

_{Generated for commit: 529996b. Link to the linter CI: here}

cc @lesteve @ogrisel

The sklearn/externals/conftest.py fix looks good.

Just to make sure, you have updated only the main-ci builds, right?

Since there is currently an issue in the doc build as you noted in #28569 (comment), maybe do not update the doc and doc-min-dependencies lock-files in this PR so this PR can be merged quicker?

The lock files of the doc build don't have much to do with the failure of the doc CI though. So I'm not sure if I follow.

I have pushed a commit with [doc build] to make sure that the full doc build is not more broken that main. If that is the case I am fine with merging the PR even with a red full doc build.

In other words, when we update a doc-related lock-file, we want to make sure the full doc build runs without issues, by adding [doc build] in the commit message. Right now we can not really do that since the full doc build is broken on main. I was originally suggesting not updating the doc-related lock-files so we avoid this issue.

I have enabled auto-merge and pushed a commit to trigger CI again (without a full doc build so it should be green)