From 26459db40d245213d0f16ced521cbc27f7b6f3cd Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <nikolaus.waxweiler@daltonmaag.com>
Date: Tue, 18 May 2021 17:31:06 +0100
Subject: [PATCH 1/2] Update multibuild to current devel

Update multibuild
---
 multibuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/multibuild b/multibuild
index ec386ef..863e233 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit ec386efaa9e6840b552d845dfc4d597f6b97a2b7
+Subproject commit 863e233db6791f787127197c9b152e2fcbc9664a

From c535ea5006a0807e1cc8d260e708b74c86ddaa4f Mon Sep 17 00:00:00 2001
From: Nikolaus Waxweiler <nikolaus.waxweiler@daltonmaag.com>
Date: Tue, 18 May 2021 16:45:37 +0100
Subject: [PATCH 2/2] Make pypy 7.3 wheels for Linux

---
 .github/workflows/ci.yml | 13 ++++++++-----
 config.sh                |  6 +-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e2e62f2..12d9357 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,17 +17,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.6, 3.7, 3.8, 3.9, "pypy3.7-7.3.5"]
         os: [ubuntu-latest, macos-latest]
         platform: [x64]
+        exclude:
+          - os: macos-latest
+            python-version: "pypy3.7-7.3.5"
     env:
       REPO_DIR: "."
       PLAT: "x86_64"
       UNICODE_WIDTH: 32
+      MB_PYTHON_VERSION: "${{ matrix.python-version }}"
       MB_ML_VER: 2014
+      DOCKER_TEST_IMAGE: "multibuild/xenial_x86_64"
       TEST_DEPENDS: "tox"
-      MB_PYTHON_VERSION: ${{ matrix.python-version }}
-      TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
       BUILD_SKIA_FROM_SOURCE: 0
       SKIA_LIBRARY_DIR: "build/download"
 
@@ -35,10 +38,10 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Set up Python 3.x
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: "3.x"
     - name: Set up environment variables
       run: |
         if [ "macos-latest" == "${{ matrix.os }}" ]; then
diff --git a/config.sh b/config.sh
index 20a32c7..b920300 100644
--- a/config.sh
+++ b/config.sh
@@ -19,12 +19,8 @@ function run_tests {
         exit 1
     fi
 
-    # select tox environment based on the current python version
-    # E.g.: '2.7' -> 'py27'
-    TOXENV="py${MB_PYTHON_VERSION//\./}"
-
     # Install pre-compiled wheel and run tests against it
-    tox --installpkg "${wheel}" -e "${TOXENV}"
+    tox --installpkg "${wheel}" -e py
 
     # clean up after us, or else running tox later on outside the docker
     # container can lead to permission errors