From 6d4c439c8f3a6eb951713783adc2b02a6b3b8acc Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Fri, 18 Sep 2020 22:17:17 -0400
Subject: [PATCH 1/2] We weren't using pypy outside of tox

---
 .github/workflows/ci.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a2fb22e..96a16a8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,6 +21,8 @@ jobs:
     name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }}
     runs-on: ${{ matrix.os.runs-on }}
     container: ${{ matrix.os.container[matrix.python.docker] }}
+    env:
+      COMMAND: ${{ matrix.python.command }}
     strategy:
       fail-fast: false
       matrix:
@@ -47,30 +49,37 @@ jobs:
             tox: py27
             action: 2.7
             docker: 2.7
+            command: python2
           - name: CPython 3.5
             tox: py35
             action: 3.5
             docker: 3.5
+            command: python3
           - name: CPython 3.6
             tox: py36
             action: 3.6
             docker: 3.6
+            command: python3
           - name: CPython 3.7
             tox: py37
             action: 3.7
             docker: 3.7
+            command: python3
           - name: CPython 3.8
             tox: py38
             action: 3.8
             docker: 3.8
+            command: python3
           - name: PyPy 2
             tox: pypy2
             action: pypy2
             docker: pypy2
+            command: pypy2
           - name: PyPy 3
             tox: pypy3
             action: pypy3
             docker: pypy3
+            command: pypy3
         reactor:
           - name: default
             tox: default
@@ -131,19 +140,19 @@ jobs:
       - name: Report Python information
         shell: bash
         run: |
-          python -c 'import sys; print(sys.version)'
+          ${COMMAND} -c 'import sys; print(sys.version)'
           echo
           echo "    <=======>"
           echo
-          pip --version
+          ${COMMAND} -m pip --version
           echo
           echo "    <=======>"
           echo
-          pip list
+          ${COMMAND} -m pip list
           echo
           echo "    <=======>"
           echo
-          pip freeze --all
+          ${COMMAND} -m pip freeze --all
       - name: Install Linux Qt5 dependencies
         if: matrix.os.python_platform == 'linux' && matrix.reactor.dependencies == 'qt5'
         run: |

From f6b31158f45099fa3072983651a3eadc043f7510 Mon Sep 17 00:00:00 2001
From: Kyle Altendorf <sda@fstab.net>
Date: Fri, 18 Sep 2020 22:24:41 -0400
Subject: [PATCH 2/2] Just pypy

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 96a16a8..866a9df 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
             tox: pypy2
             action: pypy2
             docker: pypy2
-            command: pypy2
+            command: pypy
           - name: PyPy 3
             tox: pypy3
             action: pypy3