Skip to content

Commit 5cb0644

Browse files
authored
Merge branch 'main' into convert_mode
2 parents 86b251f + f673f3e commit 5cb0644

161 files changed

Lines changed: 2219 additions & 889 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fi
2020
set -e
2121

2222
if [[ $(uname) != CYGWIN* ]]; then
23-
sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\
23+
sudo apt-get -qq install libfreetype6-dev liblcms2-dev libtiff-dev python3-tk\
2424
ghostscript libjpeg-turbo8-dev libopenjp2-7-dev\
2525
cmake meson imagemagick libharfbuzz-dev libfribidi-dev\
2626
sway wl-clipboard libopenblas-dev

.ci/requirements-cibw.txt

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

.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.14.1
1+
mypy==1.15.0
22
IceSpringPySideStubs-PyQt6
33
IceSpringPySideStubs-PySide6
44
ipython

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
}
1717
],
1818
"schedule": [
19-
"on the 3rd day of the month"
19+
"* * 3 * *"
2020
]
2121
}

.github/workflows/test-docker.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
matrix:
3636
os: ["ubuntu-latest"]
3737
docker: [
38+
# Run slower jobs first to give them a headstart and reduce waiting time
39+
ubuntu-24.04-noble-ppc64le,
40+
ubuntu-24.04-noble-s390x,
41+
# Then run the remainder
3842
alpine,
3943
amazon-2-amd64,
4044
amazon-2023-amd64,
@@ -52,13 +56,9 @@ jobs:
5256
dockerTag: [main]
5357
include:
5458
- docker: "ubuntu-24.04-noble-ppc64le"
55-
os: "ubuntu-22.04"
5659
qemu-arch: "ppc64le"
57-
dockerTag: main
5860
- docker: "ubuntu-24.04-noble-s390x"
59-
os: "ubuntu-22.04"
6061
qemu-arch: "s390x"
61-
dockerTag: main
6262
- docker: "ubuntu-24.04-noble-arm64v8"
6363
os: "ubuntu-24.04-arm"
6464
dockerTag: main
@@ -75,8 +75,9 @@ jobs:
7575

7676
- name: Set up QEMU
7777
if: "matrix.qemu-arch"
78-
run: |
79-
docker run --rm --privileged aptman/qus -s -- -p ${{ matrix.qemu-arch }}
78+
uses: docker/setup-qemu-action@v3
79+
with:
80+
platforms: ${{ matrix.qemu-arch }}
8081

8182
- name: Docker pull
8283
run: |

.github/workflows/test-mingw.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ jobs:
6060
mingw-w64-x86_64-gcc \
6161
mingw-w64-x86_64-ghostscript \
6262
mingw-w64-x86_64-lcms2 \
63+
mingw-w64-x86_64-libimagequant \
6364
mingw-w64-x86_64-libjpeg-turbo \
6465
mingw-w64-x86_64-libraqm \
6566
mingw-w64-x86_64-libtiff \

.github/workflows/test-windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ jobs:
9494
choco install nasm --no-progress
9595
echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
9696
97-
choco install ghostscript --version=10.4.0 --no-progress
98-
echo "C:\Program Files\gs\gs10.04.0\bin" >> $env:GITHUB_PATH
97+
choco install ghostscript --version=10.5.0 --no-progress
98+
echo "C:\Program Files\gs\gs10.05.0\bin" >> $env:GITHUB_PATH
9999
100100
# Install extra test images
101101
xcopy /S /Y Tests\test-images\* Tests\images

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
persist-credentials: false
7171

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

.github/workflows/wheels-dependencies.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ ARCHIVE_SDIR=pillow-depends-main
3838

3939
# Package versions for fresh source builds
4040
FREETYPE_VERSION=2.13.3
41-
HARFBUZZ_VERSION=10.2.0
42-
LIBPNG_VERSION=1.6.46
41+
HARFBUZZ_VERSION=11.0.0
42+
LIBPNG_VERSION=1.6.47
4343
JPEGTURBO_VERSION=3.1.0
4444
OPENJPEG_VERSION=2.5.3
45-
XZ_VERSION=5.6.4
46-
TIFF_VERSION=4.6.0
47-
LCMS2_VERSION=2.16
45+
if [[ $MB_ML_VER == 2014 ]]; then
46+
XZ_VERSION=5.6.4
47+
else
48+
XZ_VERSION=5.8.0
49+
fi
50+
TIFF_VERSION=4.7.0
51+
LCMS2_VERSION=2.17
4852
ZLIB_NG_VERSION=2.2.4
4953
LIBWEBP_VERSION=1.5.0
5054
BZIP2_VERSION=1.0.8

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- name: "macOS 10.15 x86_64"
6464
os: macos-13
6565
cibw_arch: x86_64
66-
build: "pp310*"
66+
build: "pp3*"
6767
macosx_deployment_target: "10.15"
6868
- name: "macOS arm64"
6969
os: macos-latest

0 commit comments

Comments
 (0)