Merge pull request #175 from mattip/pypy

Add PyPy3.7 wheels
This commit is contained in:
Andrew Murray 2020-12-25 18:01:52 +11:00 committed by GitHub
commit f1238f0a11
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions

View File

@ -1,16 +1,11 @@
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; 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, # these cause a conflict with built webp and libtiff,
# curl from brew requires zstd, use system curl # curl from brew requires zstd, use system curl
brew remove --ignore-dependencies webp zstd xz libtiff curl brew remove --ignore-dependencies webp zstd xz libtiff curl
fi fi
if [[ "$MB_PYTHON_VERSION" == "pypy3.6-7.3" ]]; then if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then if [[ "$TRAVIS_OS_NAME" != "macos-latest" ]]; then
MB_ML_VER="2010" MB_ML_VER="2010"
DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT" DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"

View File

@ -18,7 +18,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ "ubuntu-16.04", "macos-latest" ] os: [ "ubuntu-16.04", "macos-latest" ]
python: [ "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" ] platform: [ "x86_64", "i686" ]
exclude: exclude:
- os: "macos-latest" - os: "macos-latest"
@ -59,7 +59,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ "ubuntu-16.04", "macos-latest" ] os: [ "ubuntu-16.04", "macos-latest" ]
python: [ "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" ] platform: [ "x86_64", "i686" ]
exclude: exclude:
- os: "macos-latest" - os: "macos-latest"