From 3194da3d1a0e2abfd70ba54b3b2a70738603ed8a Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sun, 27 Feb 2022 18:21:48 +0100
Subject: [PATCH 1/3] chore: remove pypy2 from GHA workflow

---
 .github/workflows/test.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 10ee54b3..da5329f7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -45,13 +45,6 @@ jobs:
         shell: bash
         if: ${{ ! startsWith( matrix.python_version, 'pypy' ) }}
 
-      # Binary is named 'pypy', but setup-python specifies it as 'pypy2'.
-      - name: Run nox for pypy2
-        run: |
-          python -m nox --error-on-missing-interpreters -s tests-pypy
-        shell: bash
-        if: matrix.python_version == 'pypy2'
-
       # Binary is named 'pypy3', but setup-python specifies it as 'pypy-3.7'.
       - name: Run nox for pypy3
         run: |

From ed98e290d3c874a11e3259338626740f11ef7006 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sun, 27 Feb 2022 18:22:53 +0100
Subject: [PATCH 2/3] chore: test with PyPy 3.8 & 3.9

---
 .github/workflows/test.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index da5329f7..d53162e9 100644
--- 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,15 +39,24 @@ jobs:
           python -m pip install nox
         shell: bash
 
+      - name: Fix-up PyPy 3.9 executable
+        run: |
+          cd $(dirname $(which python))
+          if [ ! -f pypy3.exe ]; then
+            ln -s python.exe pypy3.exe
+          fi
+        shell: bash
+        if: ${{ (matrix.os == 'Windows') && (matrix.python_version == 'pypy-3.9') }}
+
       - name: Run nox
         run: |
           python -m nox --error-on-missing-interpreters -s tests-${{ matrix.python_version }}
         shell: bash
         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' ) }}

From b9291510448e807e7fffbe2a5f488c10c4e79325 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Tue, 1 Mar 2022 07:16:41 +0100
Subject: [PATCH 3/3] chore: add comment about PyPy 3.9 exe name fix-up

---
 .github/workflows/test.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d53162e9..0cb45cf2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -39,6 +39,11 @@ jobs:
           python -m pip install nox
         shell: bash
 
+      # 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: |
           cd $(dirname $(which python))