8000 DOC Fix duplicated module entries in whats_new by lesteve · Pull Request #23060 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

DOC Fix duplicated module entries in whats_new #23060

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 4 commits into from
Apr 6, 2022
Merged

DOC Fix duplicated module entries in whats_new #23060

merged 4 commits into from
Apr 6, 2022

Conversation

lesteve
Copy link
Member
@lesteve lesteve commented Apr 6, 2022 •
edited
Loading

It seems like the auto-merge functionality of whats_new files (xref #21516) is causing weird ordering of whats_new. Maybe this can happen without this auto-merge .gitattributes though.

This fixes it. I used this git grep to track duplicated modules in whats_new. Output is on main and shows some duplicated module entries:

❯ git grep -P '^:mod:' doc/whats_new/v1.1.rst | sort | uniq -c | sort -nr
      3 doc/whats_new/v1.1.rst::mod:`sklearn.feature_selection`
      2 doc/whats_new/v1.1.rst::mod:`sklearn.feature_extraction`
      2 doc/whats_new/v1.1.rst::mod:`sklearn.ensemble`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.utils`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.tree`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.svm`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.random_projection`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.preprocessing`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.pipeline`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.neural_network`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.neighbors`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.multiclass`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.model_selection`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.mixture`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.metrics`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.manifold`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.linear_model`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.kernel_approximation`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.isotonic`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.inspection`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.impute`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.gaussian_process`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.feature_extraction.text`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.dummy`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.discriminant_analysis`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.decomposition`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.datasets`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.cross_decomposition`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.covariance`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.compose`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.cluster`
      1 doc/whats_new/v1.1.rst::mod:`sklearn.calibration`

jeremiedbb
jeremiedbb reviewed Apr 6, 2022
View reviewed changes
@lesteve
Copy link
Member Author
lesteve commented Apr 6, 2022

I moved the entries to the right modules in my last commit

jeremiedbb
jeremiedbb approved these changes Apr 6, 2022
View reviewed changes
Copy link
Member
@jeremiedbb jeremiedbb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

jjerphan
jjerphan approved these changes Apr 6, 2022
View reviewed changes
Copy link
Member
@jjerphan jjerphan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thank you, @lesteve.

8000

@lesteve @jjerphan
Update doc/whats_new/v1.1.rst
ac8605a 
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
@lesteve lesteve closed this Apr 6, 2022
@lesteve lesteve reopened this Apr 6, 2022
@lesteve
Copy link
Member Author
lesteve commented Apr 6, 2022

Two approvals, merging my own PR!

@lesteve lesteve merged commit 634ef44 into scikit-learn:main Apr 6, 2022
@lesteve lesteve deleted the fix-whats-new branch April 6, 2022 13:49
@jeremiedbb jeremiedbb mentioned this pull request Apr 6, 2022
Closed
jjerphan added a commit to jjerphan/scikit-learn that referenced this pull request Apr 29, 2022
@lesteve @jjerphan 8668
DOC Fix duplicated module entries in whats_new (scikit-learn#23060)
6d334cf 
Co-authored-by: Julien Jerphanion <git@jjerphan.xyz>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jjerphan jjerphan jjerphan approved these changes

@jeremiedbb jeremiedbb jeremiedbb approved these changes

Assignees
No one assigned
Labels
Documentation
Projects
No open projects
Review sprint - Mai 2022
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@lesteve @jjerphan @jeremiedbb
0