Skip to content

Commit 9cb36a9

Browse files
authored
Upgrade from macos-13 (#9212)
Co-authored-by: Andrew Murray <[email protected]>
1 parent 9042234 commit 9cb36a9

File tree

5 files changed

+14
-21
lines changed

5 files changed

+14
-21
lines changed

.github/workflows/macos-install.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,10 @@
22

33
set -e
44

5-
if [[ "$ImageOS" == "macos13" ]]; then
6-
brew uninstall gradle maven
7-
8-
wget https://raw.githubusercontent.com/python-pillow/pillow-depends/main/freetype-2.14.1.tar.gz
9-
tar -xvzf freetype-2.14.1.tar.gz
10-
(cd freetype-2.14.1 \
11-
&& ./configure \
12-
&& make -j4 \
13-
&& make install)
14-
else
15-
brew install freetype
16-
fi
175
brew install \
186
aom \
197
dav1d \
8+
freetype \
209
ghostscript \
2110
jpeg-turbo \
2211
libimagequant \

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- { python-version: "3.14t", disable-gil: true }
5858
- { python-version: "3.13t", disable-gil: true }
5959
# Intel
60-
- { os: "macos-13", python-version: "3.10" }
60+
- { os: "macos-15-intel", python-version: "3.10" }
6161
exclude:
6262
- { os: "macos-latest", python-version: "3.10" }
6363

.github/workflows/wheels-dependencies.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,11 @@ function build {
271271
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
272272
yum remove -y zlib-devel
273273
fi
274-
build_zlib_ng
274+
if [[ -n "$IS_MACOS" ]]; then
275+
CFLAGS="$CFLAGS -headerpad_max_install_names" build_zlib_ng
276+
else
277+
build_zlib_ng
278+
fi
275279

276280
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
277281
if [[ -n "$IS_MACOS" ]]; then

.github/workflows/wheels.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ jobs:
5353
include:
5454
- name: "macOS 10.10 x86_64"
5555
platform: macos
56-
os: macos-13
56+
os: macos-15-intel
5757
cibw_arch: x86_64
5858
build: "cp3{10,11}*"
5959
macosx_deployment_target: "10.10"
6060
- name: "macOS 10.13 x86_64"
6161
platform: macos
62-
os: macos-13
62+
os: macos-15-intel
6363
cibw_arch: x86_64
6464
build: "cp3{12,13}*"
6565
macosx_deployment_target: "10.13"
6666
- name: "macOS 10.15 x86_64"
6767
platform: macos
68-
os: macos-13
68+
os: macos-15-intel
6969
cibw_arch: x86_64
7070
build: "{cp314,pp3}*"
7171
macosx_deployment_target: "10.15"
@@ -104,7 +104,7 @@ jobs:
104104
cibw_arch: arm64_iphonesimulator
105105
- name: "iOS x86_64 simulator"
106106
platform: ios
107-
os: macos-13
107+
os: macos-15-intel
108108
cibw_arch: x86_64_iphonesimulator
109109
steps:
110110
- uses: actions/checkout@v5

docs/installation/platform-support.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ These platforms are built and tested for every change.
3939
+----------------------------------+----------------------------+---------------------+
4040
| Gentoo | 3.12 | x86-64 |
4141
+----------------------------------+----------------------------+---------------------+
42-
| macOS 13 Ventura | 3.10 | x86-64 |
43-
+----------------------------------+----------------------------+---------------------+
44-
| macOS 15 Sequoia | 3.11, 3.12, 3.13, 3.14 | arm64 |
42+
| macOS 15 Sequoia | 3.10 | x86-64 |
43+
| +----------------------------+---------------------+
44+
| | 3.11, 3.12, 3.13, 3.14, | arm64 |
4545
| | PyPy3 | |
4646
+----------------------------------+----------------------------+---------------------+
4747
| Ubuntu Linux 22.04 LTS (Jammy) | 3.10 | x86-64 |

0 commit comments

Comments
 (0)