Skip to content

Commit 1200dd4

Browse files
authored
Merge branch 'main' into has_characters
2 parents 4bc6ded + 1f424ef commit 1200dd4

File tree

217 files changed

+4614
-2848
lines changed

Some content is hidden

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

217 files changed

+4614
-2848
lines changed

.ci/install.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ python3 -m pip install --upgrade wheel
2727
python3 -m pip install coverage
2828
python3 -m pip install defusedxml
2929
python3 -m pip install ipython
30-
python3 -m pip install numpy
3130
python3 -m pip install olefile
3231
python3 -m pip install -U pytest
3332
python3 -m pip install -U pytest-cov
3433
python3 -m pip install -U pytest-timeout
3534
python3 -m pip install pyroma
36-
# optional test dependency, only install if there's a binary package.
37-
# fails on beta 3.14 and PyPy
35+
# optional test dependencies, only install if there's a binary package.
36+
python3 -m pip install --only-binary=:all: numpy || true
3837
python3 -m pip install --only-binary=:all: pyarrow || true
3938

4039
# PyQt6 doesn't support PyPy3
@@ -51,10 +50,10 @@ pushd depends && ./install_webp.sh && popd
5150
pushd depends && ./install_imagequant.sh && popd
5251

5352
# raqm
54-
pushd depends && ./install_raqm.sh && popd
53+
pushd depends && sudo ./install_raqm.sh && popd
5554

5655
# libavif
57-
pushd depends && ./install_libavif.sh && popd
56+
pushd depends && sudo ./install_libavif.sh && popd
5857

5958
# extra test images
6059
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.3.0

.ci/requirements-mypy.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
mypy==1.17.1
1+
mypy==1.19.0
2+
arro3-compute
3+
arro3-core
24
IceSpringPySideStubs-PyQt6
35
IceSpringPySideStubs-PySide6
46
ipython

.github/workflows/cifuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ jobs:
4444
language: python
4545
dry-run: false
4646
- name: Upload New Crash
47-
uses: actions/upload-artifact@v4
47+
uses: actions/upload-artifact@v5
4848
if: failure() && steps.build.outcome == 'success'
4949
with:
5050
name: artifacts
5151
path: ./out/artifacts
5252
- name: Upload Legacy Crash
53-
uses: actions/upload-artifact@v4
53+
uses: actions/upload-artifact@v5
5454
if: steps.run.outcome == 'success'
5555
with:
5656
name: crash

.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@v5
35+
- uses: actions/checkout@v6
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@v5
23+
- uses: actions/checkout@v6
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: 2 additions & 6 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 \
@@ -29,9 +26,8 @@ python3 -m pip install -U pytest
2926
python3 -m pip install -U pytest-cov
3027
python3 -m pip install -U pytest-timeout
3128
python3 -m pip install pyroma
32-
python3 -m pip install numpy
33-
# optional test dependency, only install if there's a binary package.
34-
# fails on beta 3.14 and PyPy
29+
# optional test dependencies, only install if there's a binary package.
30+
python3 -m pip install --only-binary=:all: numpy || true
3531
python3 -m pip install --only-binary=:all: pyarrow || true
3632

3733
# libavif

.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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
debian-12-bookworm-amd64,
5050
debian-13-trixie-x86,
5151
debian-13-trixie-amd64,
52-
fedora-41-amd64,
5352
fedora-42-amd64,
53+
fedora-43-amd64,
5454
gentoo,
5555
ubuntu-22.04-jammy-amd64,
5656
ubuntu-24.04-noble-amd64,
@@ -68,7 +68,7 @@ jobs:
6868
name: ${{ matrix.docker }}
6969

7070
steps:
71-
- uses: actions/checkout@v5
71+
- uses: actions/checkout@v6
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@v5
48+
uses: actions/checkout@v6
4949
with:
5050
persist-credentials: false
5151

0 commit comments

Comments
 (0)