Skip to content

Commit fdd3cc7

Browse files
authored
Merge branch 'main' into ios-build
2 parents 1676f71 + a370209 commit fdd3cc7

57 files changed

Lines changed: 11949 additions & 240 deletions

Some content is hidden

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

.ci/test.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
python.exe -c "from PIL import Image"
22
IF ERRORLEVEL 1 EXIT /B
3-
python.exe -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests
3+
python.exe -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests

.ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -e
44

55
python3 -c "from PIL import Image"
66

7-
python3 -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE
7+
python3 -bb -m pytest -vv -x -W always --cov PIL --cov Tests --cov-report term --cov-report xml Tests $REVERSE

.github/workflows/wheels-test.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cd $pillow
2323
if (!$?) { exit $LASTEXITCODE }
2424
& $venv\Scripts\$python selftest.py
2525
if (!$?) { exit $LASTEXITCODE }
26-
& $venv\Scripts\$python -m pytest -vx checks\check_wheel.py
26+
& $venv\Scripts\$python -m pytest -vv -x checks\check_wheel.py
2727
if (!$?) { exit $LASTEXITCODE }
28-
& $venv\Scripts\$python -m pytest -vx Tests
28+
& $venv\Scripts\$python -m pytest -vv -x Tests
2929
if (!$?) { exit $LASTEXITCODE }

.github/workflows/wheels-test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ fi
3333

3434
# Runs tests
3535
python3 selftest.py
36-
python3 -m pytest checks/check_wheel.py
37-
python3 -m pytest
36+
python3 -m pytest -vv -x checks/check_wheel.py
37+
python3 -m pytest -vv -x

.pre-commit-config.yaml

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

88
- repo: https://github.com/psf/black-pre-commit-mirror
@@ -11,7 +11,7 @@ repos:
1111
- id: black
1212

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

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

5353
- repo: https://github.com/python-jsonschema/check-jsonschema
54-
rev: 0.33.0
54+
rev: 0.33.1
5555
hooks:
5656
- id: check-github-workflows
5757
- id: check-readthedocs

Tests/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def _cached_hopper(mode: str) -> Image.Image:
272272
else:
273273
im = hopper()
274274
if mode.startswith("BGR;"):
275-
with pytest.warns(DeprecationWarning):
275+
with pytest.warns(DeprecationWarning, match="BGR;"):
276276
im = im.convert(mode)
277277
else:
278278
try:

Tests/images/hopper_bpp2.xpm

Lines changed: 390 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)