Merge pull request #349 from hugovk/add-pypy-3.9

Add support for PyPy3.9, drop PyPy3.7

.github/workflows/wheels-linux.yml

@@ -21,7 +21,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10", "3.11" ]
+        python: [
+          "pypy3.8-7.3.10",
+          "pypy3.9-7.3.10",
+          "3.7",
+          "3.8",
+          "3.9",
+          "3.10",
+          "3.11",
+        ]
         platform: [ "i686", "x86_64" ]
         mb-ml-libc: [ "manylinux" ]
         mb-ml-ver: [ 2014, "_2_28" ]

.github/workflows/wheels-macos.yml

@@ -21,14 +21,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10", "3.11" ]
+        python: [
+          "pypy3.8-7.3.10",
+          "pypy3.9-7.3.10",
+          "3.7",
+          "3.8",
+          "3.9",
+          "3.10",
+          "3.11",
+        ]
         platform: [ "x86_64", "arm64" ]
         exclude:
           - python: "3.7"
             platform: "arm64"
-          - python: "pypy3.7-7.3.9"
+          - python: "pypy3.8-7.3.10"
             platform: "arm64"
-          - python: "pypy3.8-7.3.9"
+          - python: "pypy3.9-7.3.10"
             platform: "arm64"
     env:
       BUILD_COMMIT: ${{ inputs.build-commit }}

config.sh

@@ -144,7 +144,11 @@ function run_tests_in_repo {
 }
 
 EXP_CODECS="jpg jpg_2000 libtiff zlib"
-EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
+if [[ "$MB_PYTHON_VERSION" == pypy3.* ]] && [ -n "$IS_MACOS" ]; then
+    EXP_MODULES="freetype2 littlecms2 pil webp"
+else
+    EXP_MODULES="freetype2 littlecms2 pil tkinter webp"
+fi
 EXP_FEATURES="fribidi harfbuzz libjpeg_turbo raqm transp_webp webp_anim webp_mux xcb"
 
 function run_tests {