Merge main

Signed-off-by: Adam Li <adam2392@gmail.com>

.github/workflows/cuda-ci.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.21.1
+        uses: pypa/cibuildwheel@v2.21.3
         env:
           CIBW_BUILD: cp312-manylinux_x86_64
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014

.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@897895f1e160c830e369f9779632ebc134688e1b # v1.10.2
+      uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # v1.11.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@897895f1e160c830e369f9779632ebc134688e1b # v1.10.2
+      uses: pypa/gh-action-pypi-publish@fb13cb306901256ace3dab689990e13a5550ffaa # v1.11.0
       if: ${{ github.event.inputs.pypi_repo == 'pypi' }}
       with:
         print-hash: true

.github/workflows/wheels.yml

@@ -73,8 +73,6 @@ jobs:
           - os: windows-latest
             python: 313
             platform_id: win_amd64
-            # TODO: remove next line when Python 3.13 is released
-            prerelease_pythons: True
 
           # Linux 64 bit manylinux2014
           - os: ubuntu-latest

.gitignore

@@ -25,6 +25,9 @@ doc/developers/maintainer.rst
 doc/index.rst
 doc/min_dependency_table.rst
 doc/min_dependency_substitutions.rst
+# release notes generated by towncrier
+doc/whats_new/notes-towncrier.rst
+
 *.pdf
 pip-log.txt
 scikit_learn.egg-info/

azure-pipelines.yml

@@ -253,7 +253,7 @@ jobs:
 - template: build_tools/azure/posix.yml
   parameters:
     name: macOS
-    vmImage: macOS-12
+    vmImage: macOS-13
     dependsOn: [linting, git_commit, Ubuntu_Jammy_Jellyfish]
     # Runs when dependencies succeeded or skipped
     condition: |

build_tools/azure/debian_32bit_lock.txt

@@ -4,17 +4,17 @@
 #
 #    pip-compile --output-file=build_tools/azure/debian_32bit_lock.txt build_tools/azure/debian_32bit_requirements.txt
 #
-coverage[toml]==7.6.3
+coverage[toml]==7.6.4
     # via pytest-cov
 cython==3.0.11
     # via -r build_tools/azure/debian_32bit_requirements.txt
 iniconfig==2.0.0
     # via pytest
 joblib==1.4.2
     # via -r build_tools/azure/debian_32bit_requirements.txt
-meson==1.5.2
+meson==1.6.0
     # via meson-python
-meson-python==0.16.0
+meson-python==0.17.1
     # via -r build_tools/azure/debian_32bit_requirements.txt
 ninja==1.11.1.1
     # via -r build_tools/azure/debian_32bit_requirements.txt
@@ -25,13 +25,13 @@ packaging==24.1
     #   pytest
 pluggy==1.5.0
     # via pytest
-pyproject-metadata==0.8.1
+pyproject-metadata==0.9.0
     # via meson-python
 pytest==8.3.3
     # via
     #   -r build_tools/azure/debian_32bit_requirements.txt
     #   pytest-cov
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r build_tools/azure/debian_32bit_requirements.txt
 threadpoolctl==3.5.0
     # via -r build_tools/azure/debian_32bit_requirements.txt

build_tools/azure/install.sh

@@ -120,9 +120,11 @@ scikit_learn_install() {
         # brings in openmp so that you end up having the omp.h include inside
         # the conda environment.
         find $CONDA_PREFIX -name omp.h -delete -print
-        # meson 1.5 detects OpenMP installed with brew and OpenMP is installed
-        # with brew in CI runner
-        brew uninstall --ignore-dependencies libomp
+        # meson >= 1.5 detects OpenMP installed with brew and OpenMP may be installed
+        # with brew in CI runner. OpenMP was installed with brew in macOS-12 CI
+        # runners which doesn't seem to be the case in macOS-13 runners anymore,
+        # but we keep the next line just to be safe ...
+        brew uninstall --ignore-dependencies --force libomp
     fi
 
     if [[ "$UNAMESTR" == "Linux" ]]; then

build_tools/azure/install_setup_conda.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+set -x
+
+if [[ -z "${CONDA}" ]]; then
+    # In some runners (macOS-13 and macOS-14 in October 2024) conda is not
+    # installed so we install it ourselves
+    MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-$(uname)-$(uname -m).sh"
+    wget ${MINIFORGE_URL} -O miniforge.sh
+    bash miniforge.sh -b -u -p $HOME/miniforge3
+    CONDA="$HOME/miniforge3"
+else
+    # In most runners (in October 2024) conda is installed,
+    # but in a system folder and we want it user writable
+    sudo chown -R $USER $CONDA
+fi
+
+# Add conda to the PATH so that it can be used in further Azure CI steps.
+# Need set +x for ##vso Azure magic otherwise it may add a quote in the PATH.
+# For more details, see https://github.com/microsoft/azure-pipelines-tasks/issues/10331
+set +x
+echo "##vso[task.prependpath]$CONDA/bin"
+set -x

build_tools/azure/posix.yml

@@ -36,11 +36,8 @@ jobs:
     - bash: $(pyTools.pythonLocation)/bin/python build_tools/azure/get_selected_tests.py
       displayName: Check selected tests for all random seeds
       condition: eq(variables['Build.Reason'], 'PullRequest')
-    - bash: echo "##vso[task.prependpath]$CONDA/bin"
-      displayName: Add conda to PATH
-      condition: startsWith(variables['DISTRIB'], 'conda')
-    - bash: sudo chown -R $USER $CONDA
-      displayName: Take ownership of conda installation
+    - bash: build_tools/azure/install_setup_conda.sh
+      displayName: Install conda if necessary and set it up
       condition: startsWith(variables['DISTRIB'], 'conda')
     - task: Cache@2
       inputs: