test with PyPy 3.8 & 3.9 (#512)

pypa · Mar 2, 2022 · 75966a8 · 75966a8
1 parent 80358fd
commit 75966a8
Showing 1 changed file with 17 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,7 +23,7 @@ jobs:
       matrix:
         os: [Ubuntu, Windows, macOS]
         python_version:
-          ["3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
+          ["3.7", "3.8", "3.9", "3.10", "pypy-3.7", "pypy-3.8", "pypy-3.9"]
 
     steps:
       - uses: actions/checkout@v1
@@ -39,22 +39,29 @@ jobs:
           python -m pip install nox
         shell: bash
 
-      - name: Run nox
+      # PyPy 3.9 for Windows changed the binary name from pypy3 to pypy3.9
+      # PyPy 3.7 & 3.8 for Windows still only have pypy3
+      # https://foss.heptapod.net/pypy/pypy/-/commit/f15239a703325d97ca4fa655d00f3c05f58bd8be adds back pypy3 on 3.9
+      # pypy3 will be the only 'pypy3'-prefixed common exe name for all platforms once PyPy 7.3.9 is out
+      # TODO remove this step once pypy3.9 7.3.9 is released
+      - name: Fix-up PyPy 3.9 executable
         run: |
-          python -m nox --error-on-missing-interpreters -s tests-${{ matrix.python_version }}
+          cd $(dirname $(which python))
+          if [ ! -f pypy3.exe ]; then
+            ln -s python.exe pypy3.exe
+          fi
         shell: bash
-        if: ${{ ! startsWith( matrix.python_version, 'pypy' ) }}
+        if: ${{ (matrix.os == 'Windows') && (matrix.python_version == 'pypy-3.9') }}
 
-      # Binary is named 'pypy', but setup-python specifies it as 'pypy2'.
-      - name: Run nox for pypy2
+      - name: Run nox
         run: |
-          python -m nox --error-on-missing-interpreters -s tests-pypy
+          python -m nox --error-on-missing-interpreters -s tests-${{ matrix.python_version }}
         shell: bash
-        if: matrix.python_version == 'pypy2'
+        if: ${{ ! startsWith( matrix.python_version, 'pypy' ) }}
 
-      # Binary is named 'pypy3', but setup-python specifies it as 'pypy-3.7'.
+      # Binary is named 'pypy3', but setup-python specifies it as 'pypy-3.x'.
       - name: Run nox for pypy3
         run: |
           python -m nox --error-on-missing-interpreters -s tests-pypy3
         shell: bash
-        if: matrix.python_version == 'pypy-3.7'
+        if: ${{ startsWith( matrix.python_version, 'pypy' ) }}