Skip to content

Commit b36033e

Browse files
committed
Merge branch 'main' into imagegrab_resize
2 parents 6d51ace + 374957c commit b36033e

37 files changed

+115
-613
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

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

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

.github/workflows/test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
]
4343
python-version: [
4444
"pypy3.11",
45+
"3.15t",
46+
"3.15",
4547
"3.14t",
4648
"3.14",
4749
"3.13t",
@@ -54,6 +56,7 @@ jobs:
5456
- { python-version: "3.12", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" }
5557
- { python-version: "3.11", PYTHONOPTIMIZE: 2 }
5658
# Free-threaded
59+
- { python-version: "3.15t", disable-gil: true }
5760
- { python-version: "3.14t", disable-gil: true }
5861
- { python-version: "3.13t", disable-gil: true }
5962
# Intel

.github/workflows/wheels-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ else
9696
FREETYPE_VERSION=2.14.1
9797
fi
9898
HARFBUZZ_VERSION=12.2.0
99-
LIBPNG_VERSION=1.6.51
99+
LIBPNG_VERSION=1.6.53
100100
JPEGTURBO_VERSION=3.1.2
101101
OPENJPEG_VERSION=2.5.4
102102
XZ_VERSION=5.8.1

.github/zizmor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Configuration for the zizmor static analysis tool, run via pre-commit in CI
22
# https://docs.zizmor.sh/configuration/
33
rules:
4+
obfuscation:
5+
disable: true
46
unpinned-uses:
57
config:
68
policies:

.pre-commit-config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.14.3
3+
rev: v0.14.7
44
hooks:
55
- id: ruff-check
66
args: [--exit-non-zero-on-fix]
77

88
- repo: https://github.com/psf/black-pre-commit-mirror
9-
rev: 25.9.0
9+
rev: 25.11.0
1010
hooks:
1111
- id: black
1212

1313
- repo: https://github.com/PyCQA/bandit
14-
rev: 1.8.6
14+
rev: 1.9.2
1515
hooks:
1616
- id: bandit
1717
args: [--severity-level=high]
@@ -24,7 +24,7 @@ repos:
2424
exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
2525

2626
- repo: https://github.com/pre-commit/mirrors-clang-format
27-
rev: v21.1.2
27+
rev: v21.1.6
2828
hooks:
2929
- id: clang-format
3030
types: [c]
@@ -51,24 +51,24 @@ repos:
5151
exclude: ^\.github/.*TEMPLATE|^Tests/(fonts|images)/
5252

5353
- repo: https://github.com/python-jsonschema/check-jsonschema
54-
rev: 0.34.1
54+
rev: 0.35.0
5555
hooks:
5656
- id: check-github-workflows
5757
- id: check-readthedocs
5858
- id: check-renovate
5959

6060
- repo: https://github.com/zizmorcore/zizmor-pre-commit
61-
rev: v1.16.2
61+
rev: v1.18.0
6262
hooks:
6363
- id: zizmor
6464

6565
- repo: https://github.com/sphinx-contrib/sphinx-lint
66-
rev: v1.0.1
66+
rev: v1.0.2
6767
hooks:
6868
- id: sphinx-lint
6969

7070
- repo: https://github.com/tox-dev/pyproject-fmt
71-
rev: v2.11.0
71+
rev: v2.11.1
7272
hooks:
7373
- id: pyproject-fmt
7474

Tests/images/bmp/html/bkgd.png

-126 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)