Merge branch 'main' into submodulev3

Author: adam2392

.github/workflows/assign.yml

@@ -19,8 +19,11 @@ jobs:
        && !github.event.issue.assignee
     steps:
       - run: |
+          # Using REST API directly because assigning through gh has some severe limitations. For more details, see
+          # https://github.com/scikit-learn/scikit-learn/issues/29395#issuecomment-2206776963
           echo "Assigning issue ${{ github.event.issue.number }} to ${{ github.event.comment.user.login }}"
-          gh issue edit $ISSUE --add-assignee ${{ github.event.comment.user.login }}
+          curl -H "Authorization: token $GH_TOKEN" -d '{"assignees": ["${{ github.event.comment.user.login }}"]}' \
+              https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.issue.number }}/assignees
           gh issue edit $ISSUE --remove-label "help wanted"
         env:
           GH_TOKEN: ${{ github.token }}

.github/workflows/publish_pypi.yml

@@ -39,13 +39,13 @@ jobs:
       run: |
         python build_tools/github/check_wheels.py
     - name: Publish package to TestPyPI
-      uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
+      uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
       with:
         repository-url: https://test.pypi.org/legacy/
         print-hash: true
       if: ${{ github.event.inputs.pypi_repo == 'testpypi' }}
     - name: Publish package to PyPI
-      uses: pypa/gh-action-pypi-publish@81e9d935c883d0b210363ab89cf05f3894778450 # v1.8.14
+      uses: pypa/gh-action-pypi-publish@ec4db0b4ddc65acdf4bff5fa45ac92d78b56bdf0 # v1.9.0
       if: ${{ github.event.inputs.pypi_repo == 'pypi' }}
       with:
         print-hash: true

Makefile

@@ -1,6 +1,7 @@
 # simple makefile to simplify repetitive build env management tasks under posix
 
 PYTHON ?= python
+DEFAULT_MESON_BUILD_DIR = build/cp$(shell python -c 'import sys; print(f"{sys.version_info.major}{sys.version_info.minor}")' )
 
 all:
 	@echo "Please use 'make <target>' where <target> is one of"
@@ -21,6 +22,11 @@ clean: clean-meson
 
 clean-meson:
 	pip uninstall -y scikit-learn
+	# It seems in some cases removing the folder avoids weird compilation
+	# errors (e.g. when switching from numpy>=2 to numpy<2). For some 
+	# reason ninja clean -C $(DEFAULT_MESON_BUILD_DIR) is not
+	# enough
+	rm -rf $(DEFAULT_MESON_BUILD_DIR)
 
 dev-setuptools:
 	$(PYTHON) setup.py build_ext -i

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version       | Supported          |
 | ------------- | ------------------ |
-| 1.5.0         | :white_check_mark: |
-| < 1.5.0       | :x:                |
+| 1.5.1         | :white_check_mark: |
+| < 1.5.1       | :x:                |
 
 ## Reporting a Vulnerability
 

doc/about.rst

@@ -176,8 +176,9 @@ The project would like to thank the following funders.
 
   .. div:: text-box
 
-    `:probabl. <https://probabl.ai>`_ funds Adrin Jalali, Arturo Amor, François Goupil,
-    Guillaume Lemaitre, Jérémie du Boisberranger, Olivier Grisel, and Stefanie Senger.
+    `:probabl. <https://probabl.ai>`_ employs Adrin Jalali, Arturo Amor,
+    François Goupil, Guillaume Lemaitre, Jérémie du Boisberranger, Loïc Estève,
+    Olivier Grisel, and Stefanie Senger.
 
   .. div:: image-box
 
@@ -198,9 +199,6 @@ The project would like to thank the following funders.
 .. |dataiku| image:: images/dataiku.png
   :target: https://www.dataiku.com/
 
-.. |hf| image:: images/huggingface_logo-noborder.png
-  :target: https://huggingface.co
-
 .. |nvidia| image:: images/nvidia.png
   :target: https://www.nvidia.com
 
@@ -245,7 +243,7 @@ The project would like to thank the following funders.
       +----------+-----------+
       |  |axa|   |    |bnp|  |
       +----------+-----------+
-      | |nvidia| |    |hf|   |
+      |       |nvidia|       |
       +----------+-----------+
       |       |dataiku|      |
       +----------+-----------+
@@ -501,6 +499,9 @@ the past:
 .. |aphp| image:: images/logo_APHP_text.png
   :target: https://aphp.fr/
 
+.. |hf| image:: images/huggingface_logo-noborder.png
+  :target: https://huggingface.co
+
 .. raw:: html
 
   <style>
@@ -538,26 +539,21 @@ the past:
 
     |aphp|
 
+  .. grid-item::
+    :class: sd-text-center
+    :child-align: center
 
-Sprints
--------
-
-- The International 2019 Paris sprint was kindly hosted by `AXA <https://www.axa.fr/>`_.
-  Also some participants could attend thanks to the support of the `Alfred P.
-  Sloan Foundation <https://sloan.org>`_, the `Python Software
-  Foundation <https://www.python.org/psf/>`_ (PSF) and the `DATAIA Institute
-  <https://dataia.eu/en>`_.
-
-- The 2013 International Paris Sprint was made possible thanks to the support of
-  `Télécom Paristech <https://www.telecom-paristech.fr/>`_, `tinyclues
-  <https://www.tinyclues.com/>`_, the `French Python Association
-  <https://www.afpy.org/>`_ and the `Fonds de la Recherche Scientifique
-  <https://www.frs-fnrs.be>`_.
+    |hf|
 
-- The 2011 International Granada sprint was made possible thanks to the support
-  of the `PSF <https://www.python.org/psf/>`_ and `tinyclues
-  <https://www.tinyclues.com/>`_.
+Coding Sprints
+--------------
 
+The scikit-learn project has a long history of `open source coding sprints
+<https://blog.scikit-learn.org/events/sprints-value/>`_ with over 50 sprint
+events from 2010 to present day. There are scores of sponsors who contributed
+to costs which include venue, food, travel, developer time and more. See
+`scikit-learn sprints <https://blog.scikit-learn.org/sprints/>`_ for a full
+list of events.
 
 Donating to the project
 -----------------------

doc/datasets.rst

@@ -6,12 +6,9 @@ Dataset loading utilities
 
 .. currentmodule:: sklearn.datasets
 
-The ``sklearn.datasets`` package embeds some small toy datasets
-as introduced in the :ref:`Getting Started <loading_example_dataset>` section.
-
-This package also features helpers to fetch larger datasets commonly
-used by the machine learning community to benchmark algorithms on data
-that comes from the 'real world'.
+The ``sklearn.datasets`` package embeds some small toy datasets and provides helpers
+to fetch larger datasets commonly used by the machine learning community to benchmark
+algorithms on data that comes from the 'real world'.
 
 To evaluate the impact of the scale of the dataset (``n_samples`` and
 ``n_features``) while controlling the statistical properties of the data

doc/install.rst

@@ -33,16 +33,17 @@ Installing the latest release
 .. div:: install-instructions
 
   .. tab-set::
+    :class: tabs-os
 
-    .. tab-item:: pip
-      :class-label: tab-6
-      :sync: packager-pip
+    .. tab-item:: Windows
+      :class-label: tab-4
 
       .. tab-set::
+        :class: tabs-package-manager
 
-        .. tab-item:: Windows
-          :class-label: tab-4
-          :sync: os-windows
+        .. tab-item:: pip
+          :class-label: tab-6
+          :sync: package-manager-pip
 
           Install the 64-bit version of Python 3, for instance from the
           `official website <https://www.python.org/downloads/windows/>`__.
@@ -66,9 +67,21 @@ Installing the latest release
             python -m pip freeze             # show all installed packages in the environment
             python -c "import sklearn; sklearn.show_versions()"
 
-        .. tab-item:: macOS
-          :class-label: tab-4
-          :sync: os-macos
+        .. tab-item:: conda
+          :class-label: tab-6
+          :sync: package-manager-conda
+
+          .. include:: ./install_instructions_conda.rst
+
+    .. tab-item:: MacOS
+      :class-label: tab-4
+
+      .. tab-set::
+        :class: tabs-package-manager
+
+        .. tab-item:: pip
+          :class-label: tab-6
+          :sync: package-manager-pip
 
           Install Python 3 using `homebrew <https://brew.sh/>`_ (`brew install python`)
           or by manually installing the package from the `official website
@@ -93,9 +106,21 @@ Installing the latest release
             python -m pip freeze             # show all installed packages in the environment
             python -c "import sklearn; sklearn.show_versions()"
 
-        .. tab-item:: Linux
-          :class-label: tab-4
-          :sync: os-linux
+        .. tab-item:: conda
+          :class-label: tab-6
+          :sync: package-manager-conda
+
+          .. include:: ./install_instructions_conda.rst
+
+    .. tab-item:: Linux
+      :class-label: tab-4
+
+      .. tab-set::
+        :class: tabs-package-manager
+
+        .. tab-item:: pip
+          :class-label: tab-6
+          :sync: package-manager-pip
 
           Python 3 is usually installed by default on most Linux distributions. To
           check if you have it installed, try:
@@ -127,28 +152,12 @@ Installing the latest release
             python3 -m pip freeze             # show all installed packages in the environment
             python3 -c "import sklearn; sklearn.show_versions()"
 
-    .. tab-item:: conda
-      :class-label: tab-6
-      :sync: packager-conda
-
-      Install conda using the `Anaconda or miniconda installers
-      <https://docs.conda.io/projects/conda/en/latest/user-guide/install/>`__
-      or the `miniforge installers
-      <https://github.com/conda-forge/miniforge#miniforge>`__ (no administrator
-      permission required for any of those). Then run:
-
-      .. prompt:: bash
-
-        conda create -n sklearn-env -c conda-forge scikit-learn
-        conda activate sklearn-env
-
-      In order to check your installation, you can use:
+        .. tab-item:: conda
+          :class-label: tab-6
+          :sync: package-manager-conda
 
-      .. prompt:: bash
+          .. include:: ./install_instructions_conda.rst
 
-        conda list scikit-learn  # show scikit-learn version and location
-        conda list               # show all installed packages in the environment
-        python -c "import sklearn; sklearn.show_versions()"
 
 Using an isolated environment such as pip venv or conda makes it possible to
 install a specific version of scikit-learn with pip or conda and its dependencies

doc/install_instructions_conda.rst

@@ -0,0 +1,17 @@
+Install conda using the `Anaconda or miniconda installers
+<https://docs.conda.io/projects/conda/en/latest/user-guide/install/>`__ or the
+`miniforge installers <https://github.com/conda-forge/miniforge#miniforge>`__ (no
+administrator permission required for any of those). Then run:
+
+.. prompt:: bash
+
+  conda create -n sklearn-env -c conda-forge scikit-learn
+  conda activate sklearn-env
+
+In order to check your installation, you can use:
+
+.. prompt:: bash
+
+  conda list scikit-learn  # show scikit-learn version and location
+  conda list               # show all installed packages in the environment
+  python -c "import sklearn; sklearn.show_versions()"

doc/metadata_routing.rst

@@ -305,6 +305,7 @@ Meta-estimators and functions supporting metadata routing:
 - :func:`sklearn.model_selection.cross_val_score`
 - :func:`sklearn.model_selection.cross_val_predict`
 - :class:`sklearn.model_selection.learning_curve`
+- :class:`sklearn.model_selection.validation_curve`
 - :class:`sklearn.multiclass.OneVsOneClassifier`
 - :class:`sklearn.multiclass.OneVsRestClassifier`
 - :class:`sklearn.multiclass.OutputCodeClassifier`
@@ -323,5 +324,4 @@ Meta-estimators and tools not supporting metadata routing yet:
 - :class:`sklearn.feature_selection.RFECV`
 - :class:`sklearn.feature_selection.SequentialFeatureSelector`
 - :class:`sklearn.model_selection.permutation_test_score`
-- :class:`sklearn.model_selection.validation_curve`
 - :class:`sklearn.semi_supervised.SelfTrainingClassifier`

doc/scss/install.scss

@@ -6,15 +6,55 @@
  * https://sass-lang.com/guide/
  */
 
-.install-instructions .sd-tab-set > label.sd-tab-label {
-  margin: 0;
-  text-align: center;
+.install-instructions .sd-tab-set {
+  .sd-tab-content {
+    padding: 0.5rem 0 0 0; // Vertical gap between the two sets of nested tabs
+    background-color: transparent;
+    border: none;
 
-  &.tab-6 {
-    width: 50% !important;
+    p:first-child {
+      margin-top: 1rem !important;
+    }
   }
 
-  &.tab-4 {
-    width: calc(100% / 3) !important;
+  > label.sd-tab-label {
+    margin: 0 3px; // Horizontal gap within the same set of tabs
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 5px !important;
+
+    &.tab-6 {
+      width: calc((100% - var(--tab-caption-width, 0%)) / 2 - 6px) !important;
+    }
+
+    &.tab-4 {
+      width: calc((100% - var(--tab-caption-width, 0%)) / 3 - 6px) !important;
+    }
+  }
+
+  > input:checked + label.sd-tab-label {
+    transform: unset;
+    border: 2px solid var(--pst-color-primary);
+  }
+
+  // Show tab captions on large screens
+  @media screen and (min-width: 960px) {
+    --tab-caption-width: 20%;
+
+    &::before {
+      width: var(--tab-caption-width);
+      display: flex;
+      align-items: center;
+      font-weight: bold;
+    }
+
+    &.tabs-os::before {
+      content: "Operating System";
+    }
+
+    &.tabs-package-manager::before {
+      content: "Package Manager";
+    }
   }
 }

doc/templates/index.html

@@ -298,7 +298,6 @@ <h4 class="sk-landing-call-header">Who uses scikit-learn?</h4>
           <img src="_static/bnp-small.png" title="BNP Paris Bas Cardif">
           <img src="_static/microsoft-small.png" title="Microsoft">
           <img src="_static/dataiku-small.png" title="Dataiku">
-          <img src="_static/huggingface_logo-noborder.png" title="Hugging Face">
           <img src="_static/nvidia-small.png" title="Nvidia">
           <img src="_static/quansight-labs-small.png" title="Quansight Labs">
         </div>

doc/whats_new/v1.5.rst

@@ -48,9 +48,11 @@ Changelog
   instead of implicitly converting those inputs as regular NumPy arrays.
   :pr:`29119` by :user:`Olivier Grisel`.
 
-- |Fix| Fix a regression in :func:`metrics.accuracy_score` and in :func:`metrics.zero_one_loss`
-  causing an error for Array API dispatch with multilabel inputs.
-  :pr:`29269` by :user:`Yaroslav Korobko <Tialo>` and :pr:`29336` by :user:`Edoardo Abati <EdAbati>`.
+- |Fix| Fix a regression in :func:`metrics.accuracy_score` and in
+  :func:`metrics.zero_one_loss` causing an error for Array API dispatch with multilabel
+  inputs.
+  :pr:`29269` by :user:`Yaroslav Korobko <Tialo>` and
+  :pr:`29336` by :user:`Edoardo Abati <EdAbati>`.
 
 :mod:`sklearn.model_selection`
 ..............................
@@ -72,7 +74,7 @@ Changelog
 
 - |Fix| Fix an issue in :func:`tree.export_graphviz` and :func:`tree.plot_tree`
   that could potentially result in exception or wrong results on 32bit OSes.
-  :pr:`` by :user:`Loïc Estève<lesteve>`.
+  :pr:`29327` by :user:`Loïc Estève<lesteve>`.
 
 :mod:`sklearn.utils`
 ....................