Skip to content

Commit e533ccc

Browse files
committed
Merge branch 'main' into imagetext
2 parents 95a85dc + 5ee57e4 commit e533ccc

File tree

134 files changed

+1920
-620
lines changed

Some content is hidden

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

134 files changed

+1920
-620
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.2
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.0
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: 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-docker.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ jobs:
4747
centos-stream-10-amd64,
4848
debian-12-bookworm-x86,
4949
debian-12-bookworm-amd64,
50+
debian-13-trixie-x86,
51+
debian-13-trixie-amd64,
5052
fedora-41-amd64,
5153
fedora-42-amd64,
5254
gentoo,
@@ -66,7 +68,7 @@ jobs:
6668
name: ${{ matrix.docker }}
6769

6870
steps:
69-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@v5
7072
with:
7173
persist-credentials: false
7274

.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)