From 7400644810cdda9a378161911883ca2af014d832 Mon Sep 17 00:00:00 2001
From: mattip <matti.picus@gmail.com>
Date: Thu, 14 Oct 2021 22:03:41 +0300
Subject: [PATCH] update pypy ci specifier

---
 .github/workflows/test.yml           | 16 +++++++++-------
 docs/development/getting-started.rst |  2 +-
 noxfile.py                           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d6a30afb8..21b46997d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -19,12 +19,7 @@ jobs:
       matrix:
         os: [Ubuntu, Windows, macOS]
         python_version:
-          ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"]
-        exclude:
-          # This is failing due to pip not being in the virtual environment.
-          # https://github.com/pypa/packaging/runs/424785871#step:7:9
-          - os: windows
-            python_version: pypy3
+          ["3.6", "3.7", "3.8", "3.9", "3.10", "pypy-3.7"]
 
     steps:
       - uses: actions/checkout@v1
@@ -44,7 +39,7 @@ jobs:
         run: |
           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 'pypy', but setup-python specifies it as 'pypy2'.
       - name: Run nox for pypy2
@@ -52,3 +47,10 @@ jobs:
           python -m nox --error-on-missing-interpreters -s tests-pypy
         shell: bash
         if: matrix.python_version == 'pypy2'
+
+      # Binary is named 'pypy3.7', but setup-python specifies it as 'pypy-3.7'.
+      - name: Run nox for pypy3
+        run: |
+          python -m nox --error-on-missing-interpreters -s tests-pypy3.7
+        shell: bash
+        if: matrix.python_version == 'pypy-3.7'
diff --git a/docs/development/getting-started.rst b/docs/development/getting-started.rst
index 8bd42ac08..e0401efbf 100644
--- a/docs/development/getting-started.rst
+++ b/docs/development/getting-started.rst
@@ -34,7 +34,7 @@ each supported Python version and run the tests. For example:
     nox > * tests-3.7: success
     nox > * tests-3.8: success
     nox > * tests-3.9: success
-    nox > * tests-pypy3: skipped
+    nox > * tests-pypy3.7: skipped
 
 You may not have all the required Python versions installed, in which case you
 will see one or more ``InterpreterNotFound`` errors.
diff --git a/noxfile.py b/noxfile.py
index d5389b505..277592630 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -21,7 +21,7 @@
 nox.options.reuse_existing_virtualenvs = True
 
 
-@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3"])
+@nox.session(python=["3.6", "3.7", "3.8", "3.9", "3.10", "pypy3.7"])
 def tests(session):
     def coverage(*args):
         session.run("python", "-m", "coverage", *args)