Skip to content

Commit b71109d

Browse files
authored
Merge branch 'main' into load_palette
2 parents d06c8b3 + 4337139 commit b71109d

146 files changed

Lines changed: 970 additions & 1229 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: 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: 17 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,31 @@ name: Lint
22

33
on: [push, pull_request, workflow_dispatch]
44

5+
permissions: {}
6+
57
env:
68
FORCE_COLOR: 1
7-
8-
permissions:
9-
contents: read
9+
PREK_COLOR: always
10+
RUFF_OUTPUT_FORMAT: github
1011

1112
concurrency:
1213
group: ${{ github.workflow }}-${{ github.ref }}
1314
cancel-in-progress: true
1415

1516
jobs:
16-
build:
17-
17+
lint:
1818
runs-on: ubuntu-latest
19-
2019
name: Lint
21-
2220
steps:
23-
- uses: actions/checkout@v5
24-
with:
25-
persist-credentials: false
26-
27-
- name: pre-commit cache
28-
uses: actions/cache@v4
29-
with:
30-
path: ~/.cache/pre-commit
31-
key: lint-pre-commit-${{ hashFiles('**/.pre-commit-config.yaml') }}
32-
restore-keys: |
33-
lint-pre-commit-
34-
35-
- name: Set up Python
36-
uses: actions/setup-python@v6
37-
with:
38-
python-version: "3.x"
39-
cache: pip
40-
cache-dependency-path: "setup.py"
41-
42-
- name: Build system information
43-
run: python3 .github/workflows/system-info.py
44-
45-
- name: Install dependencies
46-
run: |
47-
python3 -m pip install -U pip
48-
python3 -m pip install -U tox
49-
50-
- name: Lint
51-
run: tox -e lint
52-
env:
53-
PRE_COMMIT_COLOR: always
54-
55-
- name: Mypy
56-
run: tox -e mypy
21+
- uses: actions/checkout@v6
22+
with:
23+
persist-credentials: false
24+
- uses: actions/setup-python@v6
25+
with:
26+
python-version: "3.10"
27+
- name: Install uv
28+
uses: astral-sh/setup-uv@v7
29+
- name: Lint
30+
run: uvx --with tox-uv tox -e lint
31+
- name: Mypy
32+
run: uvx --with tox-uv tox -e mypy

.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: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,36 @@ env:
3131

3232
jobs:
3333
build:
34-
runs-on: windows-latest
34+
runs-on: ${{ matrix.os }}
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"]
40+
os: ["windows-latest"]
4041
include:
4142
# Test the oldest Python on 32-bit
42-
- { python-version: "3.10", architecture: "x86" }
43+
- { python-version: "3.10", architecture: "x86", os: "windows-2022" }
4344

4445
timeout-minutes: 45
4546

4647
name: Python ${{ matrix.python-version }} (${{ matrix.architecture }})
4748

4849
steps:
4950
- name: Checkout Pillow
50-
uses: actions/checkout@v5
51+
uses: actions/checkout@v6
5152
with:
5253
persist-credentials: false
5354

5455
- name: Checkout cached dependencies
55-
uses: actions/checkout@v5
56+
uses: actions/checkout@v6
5657
with:
5758
persist-credentials: false
5859
repository: python-pillow/pillow-depends
5960
path: winbuild\depends
6061

6162
- name: Checkout extra test images
62-
uses: actions/checkout@v5
63+
uses: actions/checkout@v6
6364
with:
6465
persist-credentials: false
6566
repository: python-pillow/test-images
@@ -83,7 +84,7 @@ jobs:
8384
python3 -m pip install --upgrade pip
8485
8586
- name: Install CPython dependencies
86-
if: "!contains(matrix.python-version, 'pypy') && !contains(matrix.python-version, '3.14') && matrix.architecture != 'x86'"
87+
if: "!contains(matrix.python-version, 'pypy') && matrix.architecture != 'x86'"
8788
run: |
8889
python3 -m pip install PyQt6
8990

0 commit comments

Comments
 (0)