Skip to content

Backport docs updates (conda-forge link, canonical URL) to 1.6.x #30727

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 2 commits into from
Jan 28, 2025
Merged

Backport docs updates (conda-forge link, canonical URL) to 1.6.x #30727

merged 2 commits into from
Jan 28, 2025

Conversation

betatim
Copy link
Member

@betatim betatim commented Jan 28, 2025 •
edited
Loading

This is my first attempt at backporting something to a release branch. I followed the first step from https://scikit-learn.org/dev/developers/maintainer.html#reference-steps (create a new branch from main, then rebase from upstream/1.6.x).

I picked two commits. The first one updates the conda-forge install page we link to, the second one adds teh canonical URL to our docs pages.

If this works/was the right way of doing this I'll repeat it for 1.5.x

@github-actions GitHub Actions
Copy link

✔️ Linting Passed

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

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

@lesteve
Copy link
Member

lesteve commented Jan 28, 2025

Sounds good to back-port the conda-forge user-friendly doc as well since @jeremiedbb planned to do it in #30686.

@betatim
Copy link
Member Author

betatim commented Jan 28, 2025

Sounds good to back-port the conda-forge user-friendly doc as well since @jeremiedbb planned to do it in #30686.

I looked at #30686 to get an idea of how to do the backporting, which is what reminded me of the conda-forge thing :D

@lesteve
Copy link
Member

lesteve commented Jan 28, 2025

I double-checked the generated doc and it does have the rel="canonical" pointing to the stable doc, so I am setting auto-merge.

@lesteve
Copy link
Member

lesteve commented Jan 28, 2025

Ah no there is no auto-merge on release branch because no required checks, so I'll do it the old way and wait for the CI to be green ...

@lesteve
Copy link
Member

lesteve commented Jan 28, 2025

I wish I had not noticed this, but "Condaforge" all in one word does not look so nice, I'll see whether I am bothered enough to do a PR about it:
image

@lesteve lesteve merged commit fe9660a into scikit-learn:1.6.X Jan 28, 2025
38 of 39 checks passed
@betatim betatim mentioned this pull request Jan 28, 2025
Merged
@betatim betatim deleted the canonical-backport-to-v1.6.x branch January 28, 2025 13:16
@lesteve lesteve mentioned this pull request Jan 28, 2025
Merged
@lesteve
Copy link
Member

lesteve commented Jan 28, 2025 •
edited
Loading

So after a few detours, in particular fixing the 1.6.X doc build by merging #30716, rel="canonical" landed on the https://scikit-learn.org/ (stable i.e. 1.6) 🎉

@lesteve lesteve mentioned this pull request Jan 28, 2025
Merged
@lesteve
Copy link
Member

lesteve commented Jan 28, 2025 •
edited
Loading

I wish I had not noticed this, but "Condaforge" all in one word does not look so nice, I'll see whether I am bothered enough to do a PR about it:

Turns out I was bothered enough 😅, see #30731

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lesteve lesteve lesteve approved these changes

Assignees
No one assigned
Labels
No Changelog Needed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@betatim @lesteve