Merge pull request #354 from radarhere/pypy

This commit is contained in:
Hugo van Kemenade 2022-12-30 14:38:55 +02:00 committed by GitHub
commit 2e8e7c490d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions

View File

@ -22,8 +22,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
python: [ python: [
"pypy3.8-7.3.10", "pypy3.8-7.3.11",
"pypy3.9-7.3.10", "pypy3.9-7.3.11",
"3.7", "3.7",
"3.8", "3.8",
"3.9", "3.9",

View File

@ -22,8 +22,8 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
python: [ python: [
"pypy3.8-7.3.10", "pypy3.8-7.3.11",
"pypy3.9-7.3.10", "pypy3.9-7.3.11",
"3.7", "3.7",
"3.8", "3.8",
"3.9", "3.9",
@ -34,9 +34,9 @@ jobs:
exclude: exclude:
- python: "3.7" - python: "3.7"
platform: "arm64" platform: "arm64"
- python: "pypy3.8-7.3.10" - python: "pypy3.8-7.3.11"
platform: "arm64" platform: "arm64"
- python: "pypy3.9-7.3.10" - python: "pypy3.9-7.3.11"
platform: "arm64" platform: "arm64"
env: env:
BUILD_COMMIT: ${{ inputs.build-commit }} BUILD_COMMIT: ${{ inputs.build-commit }}

View File

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