mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-10-25 21:21:01 +03:00
Upgrade from macos-13 (#9212)
Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
This commit is contained in:
parent
9042234052
commit
9cb36a91d0
13
.github/workflows/macos-install.sh
vendored
13
.github/workflows/macos-install.sh
vendored
|
|
@ -2,21 +2,10 @@
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [[ "$ImageOS" == "macos13" ]]; then
|
|
||||||
brew uninstall gradle maven
|
|
||||||
|
|
||||||
wget https://raw.githubusercontent.com/python-pillow/pillow-depends/main/freetype-2.14.1.tar.gz
|
|
||||||
tar -xvzf freetype-2.14.1.tar.gz
|
|
||||||
(cd freetype-2.14.1 \
|
|
||||||
&& ./configure \
|
|
||||||
&& make -j4 \
|
|
||||||
&& make install)
|
|
||||||
else
|
|
||||||
brew install freetype
|
|
||||||
fi
|
|
||||||
brew install \
|
brew install \
|
||||||
aom \
|
aom \
|
||||||
dav1d \
|
dav1d \
|
||||||
|
freetype \
|
||||||
ghostscript \
|
ghostscript \
|
||||||
jpeg-turbo \
|
jpeg-turbo \
|
||||||
libimagequant \
|
libimagequant \
|
||||||
|
|
|
||||||
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
|
|
@ -57,7 +57,7 @@ jobs:
|
||||||
- { python-version: "3.14t", disable-gil: true }
|
- { python-version: "3.14t", disable-gil: true }
|
||||||
- { python-version: "3.13t", disable-gil: true }
|
- { python-version: "3.13t", disable-gil: true }
|
||||||
# Intel
|
# Intel
|
||||||
- { os: "macos-13", python-version: "3.10" }
|
- { os: "macos-15-intel", python-version: "3.10" }
|
||||||
exclude:
|
exclude:
|
||||||
- { os: "macos-latest", python-version: "3.10" }
|
- { os: "macos-latest", python-version: "3.10" }
|
||||||
|
|
||||||
|
|
|
||||||
6
.github/workflows/wheels-dependencies.sh
vendored
6
.github/workflows/wheels-dependencies.sh
vendored
|
|
@ -271,7 +271,11 @@ function build {
|
||||||
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
|
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
|
||||||
yum remove -y zlib-devel
|
yum remove -y zlib-devel
|
||||||
fi
|
fi
|
||||||
build_zlib_ng
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
|
CFLAGS="$CFLAGS -headerpad_max_install_names" build_zlib_ng
|
||||||
|
else
|
||||||
|
build_zlib_ng
|
||||||
|
fi
|
||||||
|
|
||||||
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
|
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
|
||||||
if [[ -n "$IS_MACOS" ]]; then
|
if [[ -n "$IS_MACOS" ]]; then
|
||||||
|
|
|
||||||
8
.github/workflows/wheels.yml
vendored
8
.github/workflows/wheels.yml
vendored
|
|
@ -53,19 +53,19 @@ jobs:
|
||||||
include:
|
include:
|
||||||
- name: "macOS 10.10 x86_64"
|
- name: "macOS 10.10 x86_64"
|
||||||
platform: macos
|
platform: macos
|
||||||
os: macos-13
|
os: macos-15-intel
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
build: "cp3{10,11}*"
|
build: "cp3{10,11}*"
|
||||||
macosx_deployment_target: "10.10"
|
macosx_deployment_target: "10.10"
|
||||||
- name: "macOS 10.13 x86_64"
|
- name: "macOS 10.13 x86_64"
|
||||||
platform: macos
|
platform: macos
|
||||||
os: macos-13
|
os: macos-15-intel
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
build: "cp3{12,13}*"
|
build: "cp3{12,13}*"
|
||||||
macosx_deployment_target: "10.13"
|
macosx_deployment_target: "10.13"
|
||||||
- name: "macOS 10.15 x86_64"
|
- name: "macOS 10.15 x86_64"
|
||||||
platform: macos
|
platform: macos
|
||||||
os: macos-13
|
os: macos-15-intel
|
||||||
cibw_arch: x86_64
|
cibw_arch: x86_64
|
||||||
build: "{cp314,pp3}*"
|
build: "{cp314,pp3}*"
|
||||||
macosx_deployment_target: "10.15"
|
macosx_deployment_target: "10.15"
|
||||||
|
|
@ -104,7 +104,7 @@ jobs:
|
||||||
cibw_arch: arm64_iphonesimulator
|
cibw_arch: arm64_iphonesimulator
|
||||||
- name: "iOS x86_64 simulator"
|
- name: "iOS x86_64 simulator"
|
||||||
platform: ios
|
platform: ios
|
||||||
os: macos-13
|
os: macos-15-intel
|
||||||
cibw_arch: x86_64_iphonesimulator
|
cibw_arch: x86_64_iphonesimulator
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v5
|
||||||
|
|
|
||||||
|
|
@ -39,9 +39,9 @@ These platforms are built and tested for every change.
|
||||||
+----------------------------------+----------------------------+---------------------+
|
+----------------------------------+----------------------------+---------------------+
|
||||||
| Gentoo | 3.12 | x86-64 |
|
| Gentoo | 3.12 | x86-64 |
|
||||||
+----------------------------------+----------------------------+---------------------+
|
+----------------------------------+----------------------------+---------------------+
|
||||||
| macOS 13 Ventura | 3.10 | x86-64 |
|
| macOS 15 Sequoia | 3.10 | x86-64 |
|
||||||
+----------------------------------+----------------------------+---------------------+
|
| +----------------------------+---------------------+
|
||||||
| macOS 15 Sequoia | 3.11, 3.12, 3.13, 3.14 | arm64 |
|
| | 3.11, 3.12, 3.13, 3.14, | arm64 |
|
||||||
| | PyPy3 | |
|
| | PyPy3 | |
|
||||||
+----------------------------------+----------------------------+---------------------+
|
+----------------------------------+----------------------------+---------------------+
|
||||||
| Ubuntu Linux 22.04 LTS (Jammy) | 3.10 | x86-64 |
|
| Ubuntu Linux 22.04 LTS (Jammy) | 3.10 | x86-64 |
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user