Skip to content

Commit fc49a44

Browse files
authored
Merge branch 'main' into jxl-support2
2 parents 470836b + 205e52b commit fc49a44

Some content is hidden

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

79 files changed

+418
-868
lines changed

.ci/install.sh

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

.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.18.2
1+
mypy==1.19.0
22
arro3-compute
33
arro3-core
44
IceSpringPySideStubs-PyQt6

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Docs
3333

3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
with:
3737
persist-credentials: false
3838

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
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

.github/workflows/macos-install.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ python3 -m pip install -U pytest
2626
python3 -m pip install -U pytest-cov
2727
python3 -m pip install -U pytest-timeout
2828
python3 -m pip install pyroma
29-
python3 -m pip install numpy
30-
# optional test dependency, only install if there's a binary package.
31-
# 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
3231
python3 -m pip install --only-binary=:all: pyarrow || true
3332

3433
# libavif

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

.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@v5
44+
- uses: actions/checkout@v6
4545
with:
4646
persist-credentials: false
4747

.github/workflows/test-valgrind.yml

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

4141
steps:
42-
- uses: actions/checkout@v5
42+
- uses: actions/checkout@v6
4343
with:
4444
persist-credentials: false
4545

.github/workflows/test-windows.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
strategy:
3636
fail-fast: false
3737
matrix:
38-
python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14"]
38+
python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14", "3.15"]
3939
architecture: ["x64"]
4040
include:
4141
# Test the oldest Python on 32-bit
@@ -47,19 +47,19 @@ jobs:
4747

4848
steps:
4949
- name: Checkout Pillow
50-
uses: actions/checkout@v5
50+
uses: actions/checkout@v6
5151
with:
5252
persist-credentials: false
5353

5454
- name: Checkout cached dependencies
55-
uses: actions/checkout@v5
55+
uses: actions/checkout@v6
5656
with:
5757
persist-credentials: false
5858
repository: python-pillow/pillow-depends
5959
path: winbuild\depends
6060

6161
- name: Checkout extra test images
62-
uses: actions/checkout@v5
62+
uses: actions/checkout@v6
6363
with:
6464
persist-credentials: false
6565
repository: python-pillow/test-images

0 commit comments

Comments
 (0)