From 795017548539d9c53ef68d393c485b8e9df33e79 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 20 Dec 2020 08:40:57 +0200 Subject: [PATCH 1/5] add pypy3.7 wheels --- .github/workflows/wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e9ca07b13..e47fa1e29 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-16.04", "macos-latest" ] - python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] + python: [ "pypy3.7-7.3","pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] platform: [ "x86_64", "i686" ] exclude: - os: "macos-latest" @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-16.04", "macos-latest" ] - python: [ "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] + python: [ "pypy3.7-7.3", "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] platform: [ "x86_64", "i686" ] exclude: - os: "macos-latest" From 35a68d028ad05e1203f69758a2bb87aee5d09f39 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 20 Dec 2020 10:19:45 +0200 Subject: [PATCH 2/5] generalize test for any pypy3 version --- .github/workflows/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index c8a892b0f..464a72ceb 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,6 +1,6 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then + if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then # for https://foss.heptapod.net/pypy/pypy/-/issues/3229 # TODO remove when that is fixed brew install tcl-tk @@ -10,7 +10,7 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew remove --ignore-dependencies webp zstd xz libtiff curl fi -if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then +if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then MB_ML_VER="2010" DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" From 3523f042932dc30bd7173eef03d4ce909db0d525 Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 20 Dec 2020 11:49:18 +0200 Subject: [PATCH 3/5] multibuild does not yet recognize pypy version 7.3.3 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e47fa1e29..1ba2b2de6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-16.04", "macos-latest" ] - python: [ "pypy3.7-7.3", "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] + python: [ "pypy3.7-7.3.3", "pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] platform: [ "x86_64", "i686" ] exclude: - os: "macos-latest" From 27ca1176fa4d6f7e0bd53107ab53d02859f17b1e Mon Sep 17 00:00:00 2001 From: mattip Date: Sun, 20 Dec 2020 12:13:08 +0200 Subject: [PATCH 4/5] multibuild does not yet recognize pypy version 7.3.3 --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1ba2b2de6..4aa28ae35 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -18,7 +18,7 @@ jobs: fail-fast: false matrix: os: [ "ubuntu-16.04", "macos-latest" ] - python: [ "pypy3.7-7.3","pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] + python: [ "pypy3.7-7.3.3","pypy3.6-7.3", "3.6", "3.7", "3.8", "3.9" ] platform: [ "x86_64", "i686" ] exclude: - os: "macos-latest" From 800c03068bd7bcfee9b1696ab9ebb01c90dd9d98 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 22 Dec 2020 12:44:54 +1100 Subject: [PATCH 5/5] Removed PyPy-specific install command --- .github/workflows/build.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 464a72ceb..83b457af0 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,10 +1,5 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then - # for https://foss.heptapod.net/pypy/pypy/-/issues/3229 - # TODO remove when that is fixed - brew install tcl-tk - fi # these cause a conflict with built webp and libtiff, # curl from brew requires zstd, use system curl brew remove --ignore-dependencies webp zstd xz libtiff curl