Merge pull request #29196 from meeseeksmachine/auto-backport-of-pr-29191-on-v3.10.x

ksunden · web-flow · commit fad43f7f3dd8 · 2024-11-27T15:12:00.000-06:00
Backport PR #29191 on branch v3.10.x (ci: Simplify 3.13t test setup)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -123,11 +123,11 @@ jobs:
           allow-prereleases: true
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: deadsnakes/action@e640ac8743173a67cca4d7d77cd837e514bf98e8  # v3.2.0
+        uses: Quansight-Labs/setup-python@b9ab292c751a42bcd2bb465b7fa202ea2c3f5796  # v5.3.1
         if: matrix.python-version == '3.13t'
         with:
-          python-version: '3.13'
-          nogil: true
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
 
       - name: Install OS dependencies
         run: |
@@ -174,11 +174,6 @@ jobs:
               texlive-luatex \
               texlive-pictures \
               texlive-xetex
-            if [[ "${{ matrix.python-version }}" = '3.13t' ]]; then
-              # TODO: Remove this once setup-python supports nogil distributions.
-              sudo apt-get install -yy --no-install-recommends \
-                python3.13-tk-nogil
-            fi
             if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
               sudo apt-get install -yy --no-install-recommends libopengl0
             else  # ubuntu-22.04
@@ -242,15 +237,6 @@ jobs:
             4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-${{ github.ref }}-
             4-${{ runner.os }}-py${{ matrix.python-version }}-mpl-
 
-      - name: Install the nightly dependencies
-        if: matrix.python-version == '3.13t'
-        run: |
-          python -m pip install pytz tzdata python-dateutil  # Must be installed for Pandas.
-          python -m pip install \
-              --pre \
-              --index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
-              --upgrade --only-binary=:all: numpy pandas pillow contourpy
-
       - name: Install Python dependencies
         run: |
           # Upgrade pip and setuptools and wheel to get as clean an install as
