Add chaining

Author: thomasjpfan

.github/workflows/wheels.yml

@@ -20,7 +20,7 @@ on:
         description: Which PyPI environment to upload to, if any
         required: true
         type: choice
-        options: ["none", "testpypi", "pypi"]
+        options: ["none", "chain", "testpypi", "pypi"]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -225,7 +225,7 @@ jobs:
 
   testpypi-publish:
     name: Publish release to TestPyPI
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'testpypi'
+    if: github.event_name == 'workflow_dispatch' && (github.event.inputs.environment == 'testpypi' || github.event.inputs.environment == 'chain')
     runs-on: ubuntu-latest
     needs: [build_wheels, build_sdist]
     environment:
@@ -255,7 +255,7 @@ jobs:
     name: Nightly upload
     if: github.repository == 'scikit-learn/scikit-learn-release' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'none'))
     runs-on: ubuntu-latest
-    needs: [build_wheels]
+    needs: [build_wheels, build_sdist]
 
     steps:
       - name: Download sdist and wheels
@@ -282,9 +282,22 @@ jobs:
 
   pypi-publish:
     name: Publish release to PyPI
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.environment == 'pypi'
+    if: >-
+      github.event_name == 'workflow_dispatch'
+      && (
+        github.event.inputs.environment == 'pypi'
+        || (
+          github.event.inputs.environment == 'chain'
+          && (needs.testpypi-publish.result == 'success' || needs.testpypi-publish.result == 'skipped')
+        )
+      )
     runs-on: ubuntu-latest
-    needs: [build_wheels, build_sdist]
+    # environment:
+    #   name: pypi
+    #   url: https://pypi.org/p/scikit-learn
+    # permissions:
+    #   id-token: write  # mandatory for trusted publishing
+    needs: [build_wheels, build_sdist, testpypi-publish]
     environment:
       name: pypi
       url: https://pypi.org/p/scikit-learn

tools/test_wheels.sh

@@ -24,9 +24,9 @@ python -c "import sklearn; sklearn.show_versions()"
 
 if pip show -qq pytest-xdist; then
     XDIST_WORKERS=$(python -c "import joblib; print(joblib.cpu_count(only_physical_cores=True))")
-    # TODO(thomasjpfan): use `--pyargs sklearn`
+    # TODO: use `--pyargs sklearn`
     pytest --pyargs sklearn.tests.test_dummy -n $XDIST_WORKERS
 else
-    # TODO(thomasjpfan): use `--pyargs sklearn`
+    # TODO: use `--pyargs sklearn`
     pytest --pyargs sklearn.tests.test_dummy
 fi

tools/test_windows_wheels.sh

@@ -18,15 +18,15 @@ if [[ $FREE_THREADED_BUILD == "False" ]]; then
     if [[ "$PLATFORM_ID" == "win_arm64" ]]; then
         echo "Running tests locally on Windows on ARM64 (WoA) as no Docker support on WoA GHA runner"
         python -c "import sklearn; sklearn.show_versions()"
-        # TODO(thomasjpfan): use `--pyargs sklearn`
+        # TODO: use `--pyargs sklearn`
         pytest --pyargs sklearn.tests.test_dummy
     else
         echo "Running tests in Docker on Windows x86_64"
         docker container run \
             --rm scikit-learn/minimal-windows \
             powershell -Command "python -c 'import sklearn; sklearn.show_versions()'"
 
-        # TODO(thomasjpfan): use `--pyargs sklearn`
+        # TODO: use `--pyargs sklearn`
         docker container run \
             -e SKLEARN_SKIP_NETWORK_TESTS=1 \
             --rm scikit-learn/minimal-windows \
@@ -36,6 +36,6 @@ else
     # This is too cumbersome to use a Docker image in the free-threaded case
     export PYTHON_GIL=0
     python -c "import sklearn; sklearn.show_versions()"
-    # TODO(thomasjpfan): use `--pyargs sklearn`
+    # TODO: use `--pyargs sklearn`
     pytest --pyargs sklearn.tests.test_dummy
 fi