Merging main

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

Author: adam2392

.github/workflows/check-changelog.yml

@@ -4,65 +4,30 @@ name: Check Changelog
 # To bypass this check, label the PR with "No Changelog Needed".
 on:
   pull_request:
-    types: [opened, edited, labeled, unlabeled, synchronize]
+    types: [opened, synchronize, labeled, unlabeled]
 
 jobs:
   check:
     name: A reviewer will let you know if it is required or can be bypassed
     runs-on: ubuntu-latest
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'No Changelog Needed') == 0 }}
     steps:
-      - name: Get PR number and milestone
-        run: |
-          echo "PR_NUMBER=${{ github.event.pull_request.number }}" >> $GITHUB_ENV
-          echo "TAGGED_MILESTONE=${{ github.event.pull_request.milestone.title }}" >> $GITHUB_ENV
       - uses: actions/checkout@v4
         with:
           fetch-depth: '0'
-      - name: Check the changelog entry
+      - name: Check if tests have changed
+        id: tests_changed
         run: |
           set -xe
           changed_files=$(git diff --name-only origin/main)
           # Changelog should be updated only if tests have been modified
-          if [[ ! "$changed_files" =~ tests ]]
-          then
-            exit 0
-          fi
-          all_changelogs=$(cat ./doc/whats_new/v*.rst)
-          if [[ "$all_changelogs" =~ :pr:\`$PR_NUMBER\` ]]
+          if [[ "$changed_files" =~ tests ]]
           then
-            echo "Changelog has been updated."
-            # If the pull request is milestoned check the correspondent changelog
-            if exist -f ./doc/whats_new/v${TAGGED_MILESTONE:0:4}.rst
-            then
-              expected_changelog=$(cat ./doc/whats_new/v${TAGGED_MILESTONE:0:4}.rst)
-              if [[ "$expected_changelog" =~ :pr:\`$PR_NUMBER\` ]]
-              then
-                echo "Changelog and milestone correspond."
-              else
-                echo "Changelog and milestone do not correspond."
-                echo "If you see this error make sure that the tagged milestone for the PR"
-                echo "and the edited changelog filename properly match."
-                exit 1
-              fi
-            fi
-          else
-            echo "A Changelog entry is missing."
-            echo ""
-            echo "Please add an entry to the changelog at 'doc/whats_new/v*.rst'"
-            echo "to document your change assuming that the PR will be merged"
-            echo "in time for the next release of scikit-learn."
-            echo ""
-            echo "Look at other entries in that file for inspiration and please"
-            echo "reference this pull request using the ':pr:' directive and"
-            echo "credit yourself (and other contributors if applicable) with"
-            echo "the ':user:' directive."
-            echo ""
-            echo "If you see this error and there is already a changelog entry,"
-            echo "check that the PR number is correct."
-            echo ""
-            echo "If you believe that this PR does not warrant a changelog"
-            echo "entry, say so in a comment so that a maintainer will label"
-            echo "the PR with 'No Changelog Needed' to bypass this check."
-            exit 1
+            echo "check_changelog=true" >> $GITHUB_OUTPUT
           fi
+
+      - name: Check changelog entry
+        if: steps.tests_changed.outputs.check_changelog == 'true'
+        uses: scientific-python/action-towncrier-changelog@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BOT_USERNAME: changelog-bot

.github/workflows/update-lock-files.yml

@@ -63,8 +63,15 @@ jobs:
         if: steps.cpr.outputs.pull-request-number != '' && matrix.name == 'array-api'
         env:
           GH_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+          PR_NUMBER: ${{steps.cpr.outputs.pull-request-number}}
         run: |
-          gh pr edit ${{steps.cpr.outputs.pull-request-number}} --add-label "CUDA CI"
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer $GH_TOKEN" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/scikit-learn/scikit-learn/issues/$PR_NUMBER/labels \
+            -d '{"labels":["CUDA CI"]}'
 
       - name: Check Pull Request
         if: steps.cpr.outputs.pull-request-number != ''

.github/workflows/wheels.yml

@@ -44,6 +44,11 @@ jobs:
   build_wheels:
     name: Build wheel for cp${{ matrix.python }}-${{ matrix.platform_id }}-${{ matrix.manylinux_image }}
     runs-on: ${{ matrix.os }}
+
+    # For conda-incubator/setup-miniconda to work
+    defaults:
+      run:
+        shell: bash -el {0}
     needs: check_build_trigger
     if: needs.check_build_trigger.outputs.build
 
@@ -102,22 +107,22 @@ jobs:
             free_threaded_support: True
 
           # MacOS x86_64
-          - os: macos-12
+          - os: macos-13
             python: 39
             platform_id: macosx_x86_64
-          - os: macos-12
+          - os: macos-13
             python: 310
             platform_id: macosx_x86_64
-          - os: macos-12
+          - os: macos-13
             python: 311
             platform_id: macosx_x86_64
-          - os: macos-12
+          - os: macos-13
             python: 312
             platform_id: macosx_x86_64
-          - os: macos-12
+          - os: macos-13
             python: 313
             platform_id: macosx_x86_64
-          - os: macos-12
+          - os: macos-13
             python: 313t
             platform_id: macosx_x86_64
             free_threaded_support: True
@@ -152,33 +157,8 @@ jobs:
         with:
           python-version: "3.11" # update once build dependencies are available
 
-      - name: Install conda for macos arm64
-        if: ${{ matrix.platform_id == 'macosx_arm64' }}
-        run: |
-          set -ex
-          # macos arm64 runners do not have conda installed. Thus we much install conda manually
-          EXPECTED_SHA="dd832d8a65a861b5592b2cf1d55f26031f7c1491b30321754443931e7b1e6832"
-          MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/download/23.11.0-0/Mambaforge-23.11.0-0-MacOSX-arm64.sh"
-          curl -L --retry 10 $MINIFORGE_URL -o miniforge.sh
-
-          # Check SHA
-          file_sha=$(shasum -a 256 miniforge.sh | awk '{print $1}')
-          if [ "$EXPECTED_SHA" != "$file_sha" ]; then
-              echo "SHA values did not match!"
-              exit 1
-          fi
-
-          # Install miniforge
-          MINIFORGE_PATH=$HOME/miniforge
-          bash ./miniforge.sh -b -p $MINIFORGE_PATH
-          echo "$MINIFORGE_PATH/bin" >> $GITHUB_PATH
-          echo "CONDA_HOME=$MINIFORGE_PATH" >> $GITHUB_ENV
-
-      - name: Set conda environment for non-macos arm64 environments
-        if: ${{ matrix.platform_id != 'macosx_arm64' }}
-        run: |
-          # Non-macos arm64 envrionments already have conda installed
-          echo "CONDA_HOME=/usr/local/miniconda" >> $GITHUB_ENV
+      - uses: conda-incubator/setup-miniconda@v3
+        if: ${{ startsWith(matrix.platform_id, 'macosx') }}
 
       - name: Build and test wheels
         env:

build_tools/azure/debian_32bit_lock.txt

@@ -4,7 +4,7 @@
 #
 #    pip-compile --output-file=build_tools/azure/debian_32bit_lock.txt build_tools/azure/debian_32bit_requirements.txt
 #
-coverage[toml]==7.6.1
+coverage[toml]==7.6.3
     # via pytest-cov
 cython==3.0.11
     # via -r build_tools/azure/debian_32bit_requirements.txt
@@ -25,7 +25,7 @@ packaging==24.1
     #   pytest
 pluggy==1.5.0
     # via pytest
-pyproject-metadata==0.8.0
+pyproject-metadata==0.8.1
     # via meson-python
 pytest==8.3.3
     # via