Skip to content

Commit 762bdce

Browse files
authored
Merge branch 'main' into rgba_pa
2 parents ba66fec + 1a1194a commit 762bdce

File tree

80 files changed

+697
-406
lines changed

Some content is hidden

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

80 files changed

+697
-406
lines changed

.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.3
1+
cibuildwheel==3.2.0

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ jobs:
3232
name: Docs
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v5
3636
with:
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Lint
2121

2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
with:
2525
persist-credentials: false
2626

@@ -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: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,19 @@ set -e
44

55
if [[ "$ImageOS" == "macos13" ]]; then
66
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
716
fi
817
brew install \
918
aom \
1019
dav1d \
11-
freetype \
1220
ghostscript \
1321
jpeg-turbo \
1422
libimagequant \

.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-docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
name: ${{ matrix.docker }}
6969

7070
steps:
71-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@v5
7272
with:
7373
persist-credentials: false
7474

.github/workflows/test-mingw.yml

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

4646
steps:
4747
- name: Checkout Pillow
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v5
4949
with:
5050
persist-credentials: false
5151

.github/workflows/test-valgrind-memory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
name: ${{ matrix.docker }}
4242

4343
steps:
44-
- uses: actions/checkout@v4
44+
- uses: actions/checkout@v5
4545
with:
4646
persist-credentials: false
4747

0 commit comments

Comments
 (0)