Merge 1188c844e3 into 19dfb7b659

.github/workflows/e2e-cache.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-version: ['3.10', 'pypy-3.10-v7.x']
+        python-version: ['3.9', 'pypy-3.9-v7.x']
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -40,7 +40,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-version: ['3.10', 'pypy-3.10-v7.x']
+        python-version: ['3.9', 'pypy-3.9-v7.x']
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -76,7 +76,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-version: ['3.10', 'pypy-3.10']
+        python-version: ['3.9', 'pypy-3.9']
     steps:
       - uses: actions/checkout@v4
       - name: Install poetry
@@ -98,7 +98,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-version: ['3.10', 'pypy-3.10-v7.x']
+        python-version: ['3.9', 'pypy-3.9-v7.x']
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python
@@ -117,7 +117,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-        python-version: ['3.10', 'pypy-3.10-v7.x']
+        python-version: ['3.9', 'pypy-3.9-v7.x']
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python

.github/workflows/e2e-tests.yml

@@ -18,18 +18,18 @@ jobs:
     strategy:
       matrix:
         operating-system:
-          [
+          [ubuntu-latest, windows-latest, macos-latest, macos-13]
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Run with setup-python 3.12
+        uses: ./
+        with:
+          python-version: 3.12
+      - name: Verify 3.12
+        run: python __tests__/verify-python.py 3.12
+
       - name: Run with setup-python 3.9.13
         uses: ./
         with:
@@ -51,19 +51,12 @@ jobs:
       - name: Verify 3.11.9
         run: python __tests__/verify-python.py 3.11.9
 
-      - name: Run with setup-python 3.12.7
+      - name: Run with setup-python 3.12.4
         uses: ./
         with:
-          python-version: 3.12.7
+          python-version: 3.12.4
-      - name: Verify 3.12.7
+      - name: Verify 3.12.4
-        run: python __tests__/verify-python.py 3.12.7
+        run: python __tests__/verify-python.py 3.12.4
-
-      - name: Run with setup-python 3.13.0
-        uses: ./
-        with:
-          python-version: 3.13.0
-      - name: Verify 3.13.0
-        run: python __tests__/verify-python.py 3.13.0
 
       - name: Run with setup-python 3.11.9
         id: cp311
@@ -75,12 +68,12 @@ jobs:
       - name: Run python-path sample 3.11.9
         run: pipx run --python '${{ steps.cp311.outputs.python-path }}' nox --version
 
-      - name: Run with setup-python ==3.13
+      - name: Run with setup-python ==3.12
         uses: ./
         with:
-          python-version: '==3.13'
+          python-version: '==3.12'
-      - name: Verify ==3.13
+      - name: Verify ==3.12
-        run: python __tests__/verify-python.py 3.13
+        run: python __tests__/verify-python.py 3.12
 
       - name: Run with setup-python <3.13
         uses: ./

.github/workflows/test-graalpy.yml

@@ -18,10 +18,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, macos-13]
         graalpy:
-          - 'graalpy-24.1'
+          - 'graalpy-23.0'
-          - 'graalpy-23.1'
+          - 'graalpy-22.3'
 
     steps:
       - name: Checkout
@@ -63,8 +63,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, macos-13]
-        graalpy: ['graalpy24.1', 'graalpy23.1']
+        graalpy: ['graalpy23.0', 'graalpy22.3']
 
     steps:
       - name: Checkout
@@ -88,14 +88,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, macos-latest, macos-13]
+        os: [ubuntu-latest, macos-latest, macos-13]
     steps:
       - uses: actions/checkout@v4
       - name: Setup GraalPy and check latest
         uses: ./
         id: graalpy
         with:
-          python-version: 'graalpy-24.x'
+          python-version: 'graalpy-23.x'
           check-latest: true
       - name: GraalPy and Python version
         run: python --version

.github/workflows/test-pypy.yml

@@ -20,15 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
         pypy:
           - 'pypy-2.7'
           - 'pypy-3.10'

.github/workflows/test-python.yml

@@ -20,16 +20,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3]
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3, 3.13.0]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -63,16 +55,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3]
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3, 3.13.0]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -109,16 +93,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3]
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3, 3.13.0]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -153,16 +129,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: [3.9.13, 3.10.11, 3.11.9, '==3.12.3']
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: [3.9.13, 3.10.11, 3.11.9, '==3.12.3', 3.13.0]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -202,16 +170,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3]
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: [3.9.13, 3.10.11, 3.11.9, 3.12.3, 3.13.0]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -251,15 +211,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -288,49 +240,49 @@ jobs:
         run: python -c 'import math; print(math.factorial(5))'
 
   setup-dev-version:
-    name: Setup 3.14-dev ${{ matrix.os }}
+    name: Setup 3.13-dev ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: setup-python 3.14-dev
+      - name: setup-python 3.13-dev
         id: setup-python
         uses: ./
         with:
-          python-version: '3.14-dev'
+          python-version: '3.13-dev'
 
       - name: Check python-path
         run: ./__tests__/check-python-path.sh '${{ steps.setup-python.outputs.python-path }}'
         shell: bash
 
       - name: Validate version
-        run: ${{ startsWith(steps.setup-python.outputs.python-version, '3.14.') }}
+        run: ${{ startsWith(steps.setup-python.outputs.python-version, '3.13.') }}
         shell: bash
 
       - name: Run simple code
         run: python -c 'import math; print(math.factorial(5))'
 
   setup-prerelease-version:
-    name: Setup 3.14 ${{ matrix.os }}
+    name: Setup 3.13 ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: setup-python 3.14
+      - name: setup-python 3.13
         id: setup-python
         uses: ./
         with:
-          python-version: '3.14'
+          python-version: '3.13'
           allow-prereleases: true
 
       - name: Check python-path
@@ -338,7 +290,7 @@ jobs:
         shell: bash
 
       - name: Validate version
-        run: ${{ startsWith(steps.setup-python.outputs.python-version, '3.14.') }}
+        run: ${{ startsWith(steps.setup-python.outputs.python-version, '3.13.') }}
         shell: bash
 
       - name: Run simple code
@@ -350,16 +302,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python: ['3.11', '3.12']
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python: ['3.11', '3.12', '3.13']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -382,16 +326,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
+        python-version: ['3.11', '3.12']
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
-        python-version: ['3.11', '3.12', '3.13']
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python and check latest
@@ -414,15 +350,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
-          [
-            ubuntu-20.04,
-            ubuntu-22.04,
-            ubuntu-24.04,
-            windows-latest,
-            macos-latest,
-            macos-13
-          ]
     steps:
       - uses: actions/checkout@v4
       - name: Setup Python and check latest
@@ -431,13 +359,12 @@ jobs:
           python-version: |
             3.11
             3.12
-            3.13
           check-latest: true
       - name: Validate version
         run: |
           $pythonVersion = (python --version)
-          if ("$pythonVersion" -NotMatch "3.13"){
+          if ("$pythonVersion" -NotMatch "3.12"){
-            Write-Host "The current version is $pythonVersion; expected version is 3.13"
+            Write-Host "The current version is $pythonVersion; expected version is 3.12"
             exit 1
           }
           $pythonVersion