Merge branch 'main' into feat/riscv64-wheels

Author: radarhere

.ci/install.sh

@@ -31,7 +31,6 @@ python3 -m pip install olefile
 python3 -m pip install -U pytest
 python3 -m pip install -U pytest-cov
 python3 -m pip install -U pytest-timeout
-python3 -m pip install pyroma
 # optional test dependencies, only install if there's a binary package.
 python3 -m pip install --only-binary=:all: numpy || true
 python3 -m pip install --only-binary=:all: pyarrow || true

.ci/requirements-mypy.txt

@@ -1,4 +1,4 @@
-mypy==1.20.2
+mypy==2.1.0
 arro3-compute
 arro3-core
 IceSpringPySideStubs-PyQt6

.github/workflows/macos-install.sh

@@ -12,7 +12,6 @@ python3 -m pip install olefile
 python3 -m pip install -U pytest
 python3 -m pip install -U pytest-cov
 python3 -m pip install -U pytest-timeout
-python3 -m pip install pyroma
 # optional test dependencies, only install if there's a binary package.
 python3 -m pip install --only-binary=:all: numpy || true
 python3 -m pip install --only-binary=:all: pyarrow || true

.github/workflows/wheels.yml

@@ -137,6 +137,7 @@ jobs:
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
           CIBW_BUILD: ${{ matrix.build }}
           CIBW_ENABLE: cpython-prerelease pypy
+          CIBW_ENVIRONMENT_PASS_LINUX: FORCE_COLOR
           CIBW_MANYLINUX_RISCV64_IMAGE: ${{ matrix.manylinux }}
           MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
 
@@ -214,7 +215,7 @@ jobs:
             -v {project}:C:\pillow
             -v C:\cibw:C:\cibw
             -v %CD%\..\venv-test:%CD%\..\venv-test
-            -e CI -e GITHUB_ACTIONS
+            -e CI -e GITHUB_ACTIONS -e FORCE_COLOR
             mcr.microsoft.com/windows/servercore:ltsc2022
             powershell C:\pillow\.github\workflows\wheels-test.ps1 %CD%\..\venv-test'
         shell: bash

.pre-commit-config.yaml

@@ -86,6 +86,13 @@ repos:
     hooks:
       - id: tox-ini-fmt
 
+  - repo: https://github.com/regebro/pyroma
+    rev: 5.0.1
+    hooks:
+      - id: pyroma
+        additional_dependencies: [check-manifest]
+        stages: [manual]
+
   - repo: meta
     hooks:
       - id: check-hooks-apply

Makefile

@@ -81,8 +81,6 @@ release-test:
 	python3 -m pytest Tests
 	python3 -m pip install .
 	python3 -m pytest -qq
-	python3 -m check_manifest
-	python3 -m pyroma .
 	$(MAKE) readme
 
 .PHONY: sdist

Tests/test_file_jpeg.py

@@ -1053,9 +1053,7 @@ def test_eof(self, monkeypatch: pytest.MonkeyPatch) -> None:
         # Even though this decoder never says that it is finished
         # the image should still end when there is no new data
         class InfiniteMockPyDecoder(ImageFile.PyDecoder):
-            def decode(
-                self, buffer: bytes | Image.SupportsArrayInterface
-            ) -> tuple[int, int]:
+            def decode(self, buffer: Image.DecoderInput) -> tuple[int, int]:
                 return 0, 0
 
         Image.register_decoder("INFINITE", InfiniteMockPyDecoder)

Tests/test_file_pdf.py

@@ -40,7 +40,8 @@ def helper_save_as_pdf(tmp_path: Path, mode: str, **kwargs: Any) -> str:
     with open(outfile, "rb") as fp:
         contents = fp.read()
     size = tuple(
-        float(d) for d in contents.split(b"/MediaBox [ 0 0 ")[1].split(b"]")[0].split()
+        int(float(d))
+        for d in contents.split(b"/MediaBox [ 0 0 ")[1].split(b"]")[0].split()
     )
     assert im.size == size
 

Tests/test_file_png.py

@@ -124,6 +124,14 @@ def test_broken(self) -> None:
             with Image.open(test_file):
                 pass
 
+    def test_ihdr_unknown_mode(self) -> None:
+        fp = BytesIO(chunk(b"IHDR", b"\x00" * 13))
+        with PngImagePlugin.PngStream(fp) as png:
+            cid, pos, length = png.read()
+            png.call(cid, pos, length)
+
+            assert png.im_mode == ""
+
     def test_bad_text(self) -> None:
         # Make sure PIL can read malformed tEXt chunks (@PIL152)
 

Tests/test_format_lab.py

@@ -19,9 +19,9 @@ def test_white() -> None:
 
     assert k == (255, 128, 128)
 
-    assert L == (255,) * 100
-    assert a == (128,) * 100
-    assert b == (128,) * 100
+    assert L == (255.0,) * 100
+    assert a == (128.0,) * 100
+    assert b == (128.0,) * 100
 
 
 def test_green() -> None: