Skip to content

Commit 4fbe28a

Browse files
committed
Merge branch 'main' into mode_enums
2 parents 55a4901 + 5ee57e4 commit 4fbe28a

110 files changed

Lines changed: 1658 additions & 460 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ pushd depends && ./install_webp.sh && popd
5151
pushd depends && ./install_imagequant.sh && popd
5252

5353
# raqm
54-
pushd depends && ./install_raqm.sh && popd
54+
pushd depends && sudo ./install_raqm.sh && popd
5555

5656
# libavif
57-
pushd depends && ./install_libavif.sh && popd
57+
pushd depends && sudo ./install_libavif.sh && popd
5858

5959
# extra test images
6060
pushd depends && ./install_extra_test_images.sh && popd

.ci/requirements-cibw.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cibuildwheel==3.1.4
1+
cibuildwheel==3.2.1

.ci/requirements-mypy.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
mypy==1.17.1
1+
mypy==1.18.2
22
IceSpringPySideStubs-PyQt6
33
IceSpringPySideStubs-PySide6
44
ipython

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
persist-credentials: false
3838

3939
- name: Set up Python
40-
uses: actions/setup-python@v5
40+
uses: actions/setup-python@v6
4141
with:
4242
python-version: "3.x"
4343
cache: pip

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
lint-pre-commit-
3434
3535
- name: Set up Python
36-
uses: actions/setup-python@v5
36+
uses: actions/setup-python@v6
3737
with:
3838
python-version: "3.x"
3939
cache: pip

.github/workflows/macos-install.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
set -e
44

5-
if [[ "$ImageOS" == "macos13" ]]; then
6-
brew uninstall gradle maven
7-
fi
85
brew install \
96
aom \
107
dav1d \

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: "Check issues"
25-
uses: actions/stale@v9
25+
uses: actions/stale@v10
2626
with:
2727
repo-token: ${{ secrets.GITHUB_TOKEN }}
2828
only-labels: "Awaiting OP Action"

.github/workflows/test-windows.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
# sets env: pythonLocation
6969
- name: Set up Python
70-
uses: actions/setup-python@v5
70+
uses: actions/setup-python@v6
7171
with:
7272
python-version: ${{ matrix.python-version }}
7373
allow-prereleases: true
@@ -97,8 +97,8 @@ jobs:
9797
choco install nasm --no-progress
9898
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
9999
100-
choco install ghostscript --version=10.5.1 --no-progress
101-
echo "C:\Program Files\gs\gs10.05.1\bin" >> $env:GITHUB_PATH
100+
choco install ghostscript --version=10.6.0 --no-progress
101+
echo "C:\Program Files\gs\gs10.06.0\bin" >> $env:GITHUB_PATH
102102
103103
# Install extra test images
104104
xcopy /S /Y Tests\test-images\* Tests\images

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
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

@@ -70,7 +70,7 @@ jobs:
7070
persist-credentials: false
7171

7272
- name: Set up Python ${{ matrix.python-version }}
73-
uses: actions/setup-python@v5
73+
uses: actions/setup-python@v6
7474
with:
7575
python-version: ${{ matrix.python-version }}
7676
allow-prereleases: true

.github/workflows/wheels-dependencies.sh

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,20 @@ ARCHIVE_SDIR=pillow-depends-main
9393
# Package versions for fresh source builds. Version numbers with "Patched"
9494
# annotations have a source code patch that is required for some platforms. If
9595
# you change those versions, ensure the patch is also updated.
96-
FREETYPE_VERSION=2.13.3
97-
HARFBUZZ_VERSION=11.3.3
96+
if [[ -n "$IOS_SDK" ]]; then
97+
FREETYPE_VERSION=2.13.3
98+
else
99+
FREETYPE_VERSION=2.14.1
100+
fi
101+
HARFBUZZ_VERSION=12.1.0
98102
LIBPNG_VERSION=1.6.50
99-
JPEGTURBO_VERSION=3.1.1
100-
OPENJPEG_VERSION=2.5.3
103+
JPEGTURBO_VERSION=3.1.2
104+
OPENJPEG_VERSION=2.5.4
101105
XZ_VERSION=5.8.1
102-
TIFF_VERSION=4.7.0
106+
ZSTD_VERSION=1.5.7
107+
TIFF_VERSION=4.7.1
103108
LCMS2_VERSION=2.17
104-
ZLIB_VERSION=1.3.1
105-
ZLIB_NG_VERSION=2.2.4
109+
ZLIB_NG_VERSION=2.2.5
106110
LIBWEBP_VERSION=1.6.0
107111
BZIP2_VERSION=1.0.8
108112
LIBXCB_VERSION=1.17.0
@@ -254,13 +258,21 @@ function build_libavif {
254258
touch libavif-stamp
255259
}
256260

261+
function build_zstd {
262+
if [ -e zstd-stamp ]; then return; fi
263+
local out_dir=$(fetch_unpack https://github.com/facebook/zstd/releases/download/v$ZSTD_VERSION/zstd-$ZSTD_VERSION.tar.gz)
264+
(cd $out_dir \
265+
&& make -j4 install)
266+
touch zstd-stamp
267+
}
268+
257269
function build {
258270
build_xz
259271
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
260272
yum remove -y zlib-devel
261273
fi
262-
if [[ -n "$IS_MACOS" ]] && [[ "$MACOSX_DEPLOYMENT_TARGET" == "10.10" || "$MACOSX_DEPLOYMENT_TARGET" == "10.13" ]]; then
263-
build_new_zlib
274+
if [[ -n "$IS_MACOS" ]]; then
275+
CFLAGS="$CFLAGS -headerpad_max_install_names" build_zlib_ng
264276
else
265277
build_zlib_ng
266278
fi
@@ -285,6 +297,7 @@ function build {
285297
--with-jpeg-include-dir=$BUILD_PREFIX/include --with-jpeg-lib-dir=$BUILD_PREFIX/lib \
286298
--disable-webp --disable-libdeflate --disable-zstd
287299
else
300+
build_zstd
288301
build_tiff
289302
fi
290303

@@ -309,6 +322,10 @@ function build {
309322

310323
if [[ -n "$IS_MACOS" ]]; then
311324
# Custom freetype build
325+
if [[ -z "$IOS_SDK" ]]; then
326+
build_simple sed 4.9 https://mirrors.middlendian.com/gnu/sed
327+
fi
328+
312329
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
313330
else
314331
build_freetype

0 commit comments

Comments
 (0)