python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-29 03:16:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from radarhere/exclude

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-03-20 11:25:05 +02:00 committed by GitHub
commit 5c9cab437b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/build.sh vendored
View File

@ -4,6 +4,12 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
# curl from brew requires zstd, use system curl # curl from brew requires zstd, use system curl
# if php is installed, brew tries to reinstall these after installing openblas # if php is installed, brew tries to reinstall these after installing openblas
brew remove --ignore-dependencies webp zstd xz libtiff libxcb curl php brew remove --ignore-dependencies webp zstd xz libtiff libxcb curl php
if [[ "$PLAT" == "arm64" ]]; then
MACOSX_DEPLOYMENT_TARGET="11.0"
else
MACOSX_DEPLOYMENT_TARGET="10.10"
fi
fi fi
if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then

30
.github/workflows/wheels-build.yml vendored
View File

@ -25,37 +25,31 @@ jobs:
matrix: matrix:
os: [ "macos-latest", "ubuntu-20.04" ] os: [ "macos-latest", "ubuntu-20.04" ]
python: [ "pypy3.7-7.3.8", "pypy3.8-7.3.8", "3.7", "3.8", "3.9", "3.10" ] python: [ "pypy3.7-7.3.8", "pypy3.8-7.3.8", "3.7", "3.8", "3.9", "3.10" ]
platform: [ "x86_64", "i686" ] platform: [ "arm64", "x86_64", "i686" ]
macos-target: [ "10.10" ]
exclude: exclude:
- os: "macos-latest" - os: "macos-latest"
platform: "i686" platform: "i686"
- os: "macos-latest"
platform: "arm64"
python: "3.7"
- os: "macos-latest"
platform: "arm64"
python: "pypy3.7-7.3.8"
- os: "macos-latest"
platform: "arm64"
python: "pypy3.8-7.3.8"
- os: "ubuntu-20.04"
platform: "arm64"
include: include:
- os: "macos-latest" - os: "macos-latest"
os-name: "osx" os-name: "osx"
- os: "ubuntu-20.04" - os: "ubuntu-20.04"
os-name: "focal" os-name: "focal"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
python: "3.10"
macos-target: "11.0"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
python: "3.9"
macos-target: "11.0"
- os: "macos-11"
os-name: "osx"
platform: "arm64"
python: "3.8"
macos-target: "11.0"
env: env:
BUILD_COMMIT: ${{ inputs.build-commit }} BUILD_COMMIT: ${{ inputs.build-commit }}
PLAT: ${{ matrix.platform }} PLAT: ${{ matrix.platform }}
MB_PYTHON_VERSION: ${{ matrix.python }} MB_PYTHON_VERSION: ${{ matrix.python }}
TRAVIS_OS_NAME: ${{ matrix.os-name }} TRAVIS_OS_NAME: ${{ matrix.os-name }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macos-target }}
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
with: with: