Skip to content

MNT Fix pre-commit #31013

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
merged 4 commits into from
Mar 22, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
exclude: '^(.git/|sklearn/externals/|asv_benchmarks/env/)'
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v5.0.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
Expand Down
1 change: 0 additions & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ all priceless contributions.

We abide by the principles of openness, respect, and consideration of others of
the Python Software Foundation: https://www.python.org/psf/codeofconduct/

2 changes: 1 addition & 1 deletion asv_benchmarks/benchmarks/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Can be overridden by environment variable SKLBENCH_PROFILE.
"profile": "regular",

// List of values of n_jobs to use for estimators which accept this
// List of values of n_jobs to use for estimators which accept this
// parameter (-1 means all cores). An empty list means all values from 1 to
// the maximum number of available cores.
// Can be overridden by environment variable SKLBENCH_NJOBS.
Expand Down
2 changes: 1 addition & 1 deletion doc/developers/maintainer.rst.template
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ Reference Steps
{%- if key != "rc" %}
* [ ] Publish to https://github.com/scikit-learn/scikit-learn/releases
{%- endif %}
* [ ] Announce on mailing list and on social media platforms (LinkedIn, Bluesky, etc.)
* [ ] Announce on mailing list and on social media platforms (LinkedIn, Bluesky, etc.)
{%- if key != "rc" %}
* [ ] Update SECURITY.md in main branch
{%- endif %}
Expand Down
10 changes: 5 additions & 5 deletions doc/logos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ You may highlight or reference your work with scikit-learn by using one of the l

| | |
| - | - |
| <img src="1280px-scikit-learn-logo.png" height="100px"> | __Logo 1__ <br> File type: PNG <br> File size: 49 KB (1280 x 689 px) <br> File name: [1280px-scikit-learn-logo.png](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/1280px-scikit-learn-logo.png) |
| <img src="1280px-scikit-learn-logo.png" height="100px"> | __Logo 1__ <br> File type: PNG <br> File size: 49 KB (1280 x 689 px) <br> File name: [1280px-scikit-learn-logo.png](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/1280px-scikit-learn-logo.png) |
| <img src="favicon.ico" height="100px"> | __Logo 2__ <br> File type: ICO <br> File size: 2 KB (32 x 32 px) <br> File name: [favicon.ico](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/favicon.ico) |
| <img src="scikit-learn-logo-without-subtitle.svg" height="100px"> | __Logo 3__ <br> File type: SVG <br> File size: 5 KB <br> File name: [scikit-learn-logo-without-subtitle.svg](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/scikit-learn-logo-without-subtitle.svg) |
| <img src="scikit-learn-logo.svg" height="200px"> | __Logo 4__ <br> File type: SVG <br> File size: 4.59 KB <br> File name: [scikit-learn-logo.svg](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/scikit-learn-logo.svg) |
| <img src="scikit-learn-logo-without-subtitle.svg" height="100px"> | __Logo 3__ <br> File type: SVG <br> File size: 5 KB <br> File name: [scikit-learn-logo-without-subtitle.svg](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/scikit-learn-logo-without-subtitle.svg) |
| <img src="scikit-learn-logo.svg" height="200px"> | __Logo 4__ <br> File type: SVG <br> File size: 4.59 KB <br> File name: [scikit-learn-logo.svg](https://github.com/scikit-learn/scikit-learn/blob/main/doc/logos/scikit-learn-logo.svg) |

<br>

Expand All @@ -51,8 +51,8 @@ You may highlight or reference your work with scikit-learn by using one of the l

- __Clear Space:__ To ensure the logo is clearly visible in all uses, surround it with a sufficient amount of clear space that is free of type, graphics, and other elements that might cause visual clutter. Do not overlap or obscure the logo with text, images, or other elements. The image below demonstrates the suggested amount of clear space margins to use around the logo. <br> <center><img src="brand_guidelines/scikitlearn_logo_clearspace_updated.png" width="250px"></center>

- __Colors:__ Only use logos in the approved color palette defined above. Do not recolor the logo.
- __Typeface:__ Do not change the typeface used in the logo.
- __Colors:__ Only use logos in the approved color palette defined above. Do not recolor the logo.
- __Typeface:__ Do not change the typeface used in the logo.
- __No Modification:__ Do not attempt recreate or otherwise modify the scikit-learn logo.


Expand Down
4 changes: 2 additions & 2 deletions doc/modules/biclustering.rst
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ available:

2. Assign biclusters from one set to another in a one-to-one fashion
to maximize the sum of their similarities. This step is performed
using :func:`scipy.optimize.linear_sum_assignment`, which uses a
using :func:`scipy.optimize.linear_sum_assignment`, which uses a
modified Jonker-Volgenant algorithm.

3. The final sum of similarities is divided by the size of the larger
Expand All @@ -303,4 +303,4 @@ are identical.

* Hochreiter, Bodenhofer, et. al., 2010. `FABIA: factor analysis
for bicluster acquisition
<https://www.ncbi.nlm.nih.gov/pmc/articles/PMC2881408/>`__.
<https://www.ncbi.nlm.nih.gov/pmc/articles/PMC2881408/>`__.
4 changes: 2 additions & 2 deletions doc/modules/feature_selection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,8 @@ alpha parameter, the fewer features selected.
noise, the smallest absolute value of non-zero coefficients, and the
structure of the design matrix X. In addition, the design matrix must
display certain specific properties, such as not being too correlated.
On the use of Lasso for sparse signal recovery, see this example on
compressive sensing:
On the use of Lasso for sparse signal recovery, see this example on
compressive sensing:
:ref:`sphx_glr_auto_examples_applications_plot_tomography_l1_reconstruction.py`.

There is no general rule to select an alpha parameter for recovery of
Expand Down
2 changes: 1 addition & 1 deletion doc/modules/svm.rst
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ used, please refer to their respective papers.
Volume 14 Issue 3, August 2004, p. 199-222.

.. [#7] Schölkopf et. al `New Support Vector Algorithms
<https://www.stat.purdue.edu/~yuzhu/stat598m3/Papers/NewSVM.pdf>`_,
<https://www.stat.purdue.edu/~yuzhu/stat598m3/Papers/NewSVM.pdf>`_,
Neural Computation 12, 1207-1245 (2000).

.. [#8] Crammer and Singer `On the Algorithmic Implementation of Multiclass
Expand Down
1 change: 0 additions & 1 deletion doc/testimonials/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ https://docs.google.com/spreadsheet/ccc?key=0AhGnAxuBDhjmdDYwNzlZVE5SMkFsMjNBbGl

To obtain access to this file, send an email to:
nelle dot varoquaux at gmail dot com

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
users to pass their own grid of values at which the partial dependence should be
calculated.
By :user:`Freddy A. Boulton <freddyaboulton>` and :user:`Stephen Pardy
<stephenpardy>`
<stephenpardy>`
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- :class:`inspection.DecisionBoundaryDisplay` now supports
plotting all classes for multi-class problems when `response_method` is
'decision_function', 'predict_proba' or 'auto'.
By :user:`Lucy Liu <lucyleeow>`
By :user:`Lucy Liu <lucyleeow>`
68 changes: 34 additions & 34 deletions doc/whats_new/v1.6.rst
Original file line number Diff line number Diff line change
Expand Up @@ -748,38 +748,38 @@ Python and CPython ecosystem, for example :user:`Nathan Goldbaum <ngoldbaum>`,
Thanks to everyone who has contributed to the maintenance and improvement of
the project since version 1.5, including:

Aaron Schumacher, Abdulaziz Aloqeely, abhi-jha, Acciaro Gennaro Daniele, Adam
J. Stewart, Adam Li, Adeel Hassan, Adeyemi Biola, Aditi Juneja, Adrin Jalali,
Aisha, Akanksha Mhadolkar, Akihiro Kuno, Alberto Torres, alexqiao, Alihan
Zihna, Aniruddha Saha, antoinebaker, Antony Lee, Anurag Varma, Arif Qodari,
Arthur Courselle, ArthurDbrn, Arturo Amor, Aswathavicky, Audrey Flanders,
aurelienmorgan, Austin, awwwyan, AyGeeEm, a.zy.lee, baggiponte, BlazeStorm001,
bme-git, Boney Patel, brdav, Brigitta Sipőcz, Cailean Carter, Camille
Troillard, Carlo Lemos, Christian Lorentzen, Christian Veenhuis, Christine P.
Chai, claudio, Conrad Stevens, datarollhexasphericon, Davide Chicco, David
Matthew Cherney, Dea María Léon, Deepak Saldanha, Deepyaman Datta,
dependabot[bot], dinga92, Dmitry Kobak, Domenico, Drew Craeton, dymil, Edoardo
Abati, EmilyXinyi, Eric Larson, Evelyn, fabianhenning, Farid "Freddie" Taba,
Gael Varoquaux, Giorgio Angelotti, Gleb Levitski, Guillaume Lemaitre, Guntitat
Sawadwuthikul, Haesun Park, Hanjun Kim, Henrique Caroço, hhchen1105, Hugo
Boulenger, Ilya Komarov, Inessa Pawson, Ivan Pan, Ivan Wiryadi, Jaimin Chauhan,
Jakob Bull, James Lamb, Janez Demšar, Jérémie du Boisberranger, Jérôme
Dockès, Jirair Aroyan, João Morais, Joe Cainey, Joel Nothman, John Enblom,
JorgeCardenas, Joseph Barbier, jpienaar-tuks, Julian Chan, K.Bharat Reddy,
Kevin Doshi, Lars, Loic Esteve, Lucas Colley, Lucy Liu, lunovian, Marc Bresson,
Marco Edward Gorelli, Marco Maggi, Marco Wolsza, Maren Westermann,
MarieS-WiMLDS, Martin Helm, Mathew Shen, mathurinm, Matthew Feickert, Maxwell
Liu, Meekail Zain, Michael Dawson, Miguel Cárdenas, m-maggi, mrastgoo, Natalia
Mokeeva, Nathan Goldbaum, Nathan Orgera, nbrown-ScottLogic, Nikita Chistyakov,
Nithish Bolleddula, Noam Keidar, NoPenguinsLand, Norbert Preining, notPlancha,
Olivier Grisel, Omar Salman, ParsifalXu, Piotr, Priyank Shroff, Priyansh Gupta,
Quentin Barthélemy, Rachit23110261, Rahil Parikh, raisadz, Rajath,
renaissance0ne, Reshama Shaikh, Roberto Rosati, Robert Pollak, rwelsch427,
Santiago Castro, Santiago M. Mola, scikit-learn-bot, sean moiselle, SHREEKANT
VITTHAL NANDIYAWAR, Shruti Nath, Søren Bredlund Caspersen, Stefanie Senger,
Stefano Gaspari, Steffen Schneider, Štěpán Sršeň, Sylvain Combettes,
Tamara, Thomas, Thomas Gessey-Jones, Thomas J. Fan, Thomas Li, ThorbenMaa,
Tialo, Tim Head, Tuhin Sharma, Tushar Parimi, Umberto Fasci, UV, vedpawar2254,
Velislav Babatchev, Victoria Shevchenko, viktor765, Vince Carey, Virgil Chan,
Wang Jiayi, Xiao Yuan, Xuefeng Xu, Yao Xiao, yareyaredesuyo, Zachary Vealey,
Aaron Schumacher, Abdulaziz Aloqeely, abhi-jha, Acciaro Gennaro Daniele, Adam
J. Stewart, Adam Li, Adeel Hassan, Adeyemi Biola, Aditi Juneja, Adrin Jalali,
Aisha, Akanksha Mhadolkar, Akihiro Kuno, Alberto Torres, alexqiao, Alihan
Zihna, Aniruddha Saha, antoinebaker, Antony Lee, Anurag Varma, Arif Qodari,
Arthur Courselle, ArthurDbrn, Arturo Amor, Aswathavicky, Audrey Flanders,
aurelienmorgan, Austin, awwwyan, AyGeeEm, a.zy.lee, baggiponte, BlazeStorm001,
bme-git, Boney Patel, brdav, Brigitta Sipőcz, Cailean Carter, Camille
Troillard, Carlo Lemos, Christian Lorentzen, Christian Veenhuis, Christine P.
Chai, claudio, Conrad Stevens, datarollhexasphericon, Davide Chicco, David
Matthew Cherney, Dea María Léon, Deepak Saldanha, Deepyaman Datta,
dependabot[bot], dinga92, Dmitry Kobak, Domenico, Drew Craeton, dymil, Edoardo
Abati, EmilyXinyi, Eric Larson, Evelyn, fabianhenning, Farid "Freddie" Taba,
Gael Varoquaux, Giorgio Angelotti, Gleb Levitski, Guillaume Lemaitre, Guntitat
Sawadwuthikul, Haesun Park, Hanjun Kim, Henrique Caroço, hhchen1105, Hugo
Boulenger, Ilya Komarov, Inessa Pawson, Ivan Pan, Ivan Wiryadi, Jaimin Chauhan,
Jakob Bull, James Lamb, Janez Demšar, Jérémie du Boisberranger, Jérôme
Dockès, Jirair Aroyan, João Morais, Joe Cainey, Joel Nothman, John Enblom,
JorgeCardenas, Joseph Barbier, jpienaar-tuks, Julian Chan, K.Bharat Reddy,
Kevin Doshi, Lars, Loic Esteve, Lucas Colley, Lucy Liu, lunovian, Marc Bresson,
Marco Edward Gorelli, Marco Maggi, Marco Wolsza, Maren Westermann,
MarieS-WiMLDS, Martin Helm, Mathew Shen, mathurinm, Matthew Feickert, Maxwell
Liu, Meekail Zain, Michael Dawson, Miguel Cárdenas, m-maggi, mrastgoo, Natalia
Mokeeva, Nathan Goldbaum, Nathan Orgera, nbrown-ScottLogic, Nikita Chistyakov,
Nithish Bolleddula, Noam Keidar, NoPenguinsLand, Norbert Preining, notPlancha,
Olivier Grisel, Omar Salman, ParsifalXu, Piotr, Priyank Shroff, Priyansh Gupta,
Quentin Barthélemy, Rachit23110261, Rahil Parikh, raisadz, Rajath,
renaissance0ne, Reshama Shaikh, Roberto Rosati, Robert Pollak, rwelsch427,
Santiago Castro, Santiago M. Mola, scikit-learn-bot, sean moiselle, SHREEKANT
VITTHAL NANDIYAWAR, Shruti Nath, Søren Bredlund Caspersen, Stefanie Senger,
Stefano Gaspari, Steffen Schneider, Štěpán Sršeň, Sylvain Combettes,
Tamara, Thomas, Thomas Gessey-Jones, Thomas J. Fan, Thomas Li, ThorbenMaa,
Tialo, Tim Head, Tuhin Sharma, Tushar Parimi, Umberto Fasci, UV, vedpawar2254,
Velislav Babatchev, Victoria Shevchenko, viktor765, Vince Carey, Virgil Chan,
Wang Jiayi, Xiao Yuan, Xuefeng Xu, Yao Xiao, yareyaredesuyo, Zachary Vealey,
Ziad Amerr
1 change: 0 additions & 1 deletion examples/cross_decomposition/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Cross decomposition
-------------------

Examples concerning the :mod:`sklearn.cross_decomposition` module.

1 change: 0 additions & 1 deletion examples/decomposition/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Decomposition
-------------

Examples concerning the :mod:`sklearn.decomposition` module.

2 changes: 1 addition & 1 deletion examples/developing_estimators/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
Developing Estimators
---------------------

Examples concerning the development of Custom Estimator.
Examples concerning the development of Custom Estimator.
1 change: 0 additions & 1 deletion examples/frozen/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Frozen Estimators
-----------------

Examples concerning the :mod:`sklearn.frozen` module.

1 change: 0 additions & 1 deletion examples/gaussian_process/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Gaussian Process for Machine Learning
-------------------------------------

Examples concerning the :mod:`sklearn.gaussian_process` module.

1 change: 0 additions & 1 deletion examples/inspection/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Inspection
----------

Examples related to the :mod:`sklearn.inspection` module.

1 change: 0 additions & 1 deletion examples/manifold/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Manifold learning
-----------------------

Examples concerning the :mod:`sklearn.manifold` module.

1 change: 0 additions & 1 deletion examples/miscellaneous/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ Miscellaneous
-------------

Miscellaneous and introductory examples for scikit-learn.

3 changes: 0 additions & 3 deletions sklearn/datasets/images/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ Retrieved 21st August, 2011 from [3] by Robert Layton
[1] https://creativecommons.org/licenses/by/2.0/
[2] https://www.flickr.com/photos/vultilion/
[3] https://www.flickr.com/photos/vultilion/6056698931/sizes/z/in/photostream/



2 changes: 1 addition & 1 deletion sklearn/datasets/tests/data/svmlight_classification.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# comment
# note: the next line contains a tab
1.0 3:2.5 11:-5.2 16:1.5 # and an inline comment
2.0 6:1.0 13:-3
2.0 6:1.0 13:-3
# another comment
3.0 21:27
4.0 2:1.234567890123456e10 # double precision value
Expand Down
2 changes: 1 addition & 1 deletion sklearn/datasets/tests/data/svmlight_multilabel.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# multilabel dataset in SVMlight format
1,0 2:2.5 10:-5.2 15:1.5
2 5:1.0 12:-3
2 5:1.0 12:-3
2:3.5 11:26
1,2 20:27
1 change: 0 additions & 1 deletion sklearn/svm/src/liblinear/linear.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,3 @@ void set_print_string_function(void (*print_func) (const char*));
#endif

#endif /* _LIBLINEAR_H */

1 change: 0 additions & 1 deletion sklearn/utils/src/MurmurHash3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -343,4 +343,3 @@ void MurmurHash3_x64_128 ( const void * key, const int len,
}

//-----------------------------------------------------------------------------

Loading