Merge branch 'main' into type-hints-replace-io.BytesIO

Author: hugovk

.github/workflows/docs.yml

@@ -37,16 +37,26 @@ jobs:
       with:
         python-version: "3.x"
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: "3.x"
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Build
       run: |

.github/workflows/test.yml

@@ -26,6 +26,9 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+env:
+  FORCE_COLOR: 1
+
 jobs:
   build:
 
@@ -65,17 +68,28 @@ jobs:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true
         cache: pip
-        cache-dependency-path: ".ci/*.sh"
+        cache-dependency-path: |
+          ".ci/*.sh"
+          "pyproject.toml"
 
     - name: Build system information
       run: python3 .github/workflows/system-info.py
 
+    - name: Cache libimagequant
+      if: startsWith(matrix.os, 'ubuntu')
+      uses: actions/cache@v4
+      id: cache-libimagequant
+      with:
+        path: ~/cache-libimagequant
+        key: ${{ runner.os }}-libimagequant-${{ hashFiles('depends/install_imagequant.sh') }}
+
     - name: Install Linux dependencies
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         .ci/install.sh
       env:
         GHA_PYTHON_VERSION: ${{ matrix.python-version }}
+        GHA_LIBIMAGEQUANT_CACHE_HIT: ${{ steps.cache-libimagequant.outputs.cache-hit }}
 
     - name: Install macOS dependencies
       if: startsWith(matrix.os, 'macOS')

CHANGES.rst

@@ -5,6 +5,12 @@ Changelog (Pillow)
 10.3.0 (unreleased)
 -------------------
 
+- Do not support using test-image-results to upload images after test failures #7739
+  [radarhere]
+
+- Changed ImageMath.ops to be static #7721
+  [radarhere]
+
 - Fix APNG info after seeking backwards more than twice #7701
   [esoma, radarhere]
 

Tests/check_j2k_overflow.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-from pathlib import PosixPath
+from pathlib import Path
 
 import pytest
 
 from PIL import Image
 
 
-def test_j2k_overflow(tmp_path: PosixPath) -> None:
+def test_j2k_overflow(tmp_path: Path) -> None:
     im = Image.new("RGBA", (1024, 131584))
     target = str(tmp_path / "temp.jpc")
     with pytest.raises(OSError):

Tests/check_large_memory.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from pathlib import PosixPath
+from pathlib import Path
 from types import ModuleType
 
 import pytest
@@ -31,18 +31,18 @@
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path: PosixPath, xdim: int, ydim: int) -> None:
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     f = str(tmp_path / "temp.png")
     im = Image.new("L", (xdim, ydim), 0)
     im.save(f)
 
 
-def test_large(tmp_path: PosixPath) -> None:
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path: PosixPath) -> None:
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)
 

Tests/check_large_memory_numpy.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import sys
-from pathlib import PosixPath
+from pathlib import Path
 
 import pytest
 
@@ -25,19 +25,19 @@
 pytestmark = pytest.mark.skipif(sys.maxsize <= 2**32, reason="requires 64-bit system")
 
 
-def _write_png(tmp_path: PosixPath, xdim: int, ydim: int) -> None:
+def _write_png(tmp_path: Path, xdim: int, ydim: int) -> None:
     dtype = np.uint8
     a = np.zeros((xdim, ydim), dtype=dtype)
     f = str(tmp_path / "temp.png")
     im = Image.fromarray(a, "L")
     im.save(f)
 
 
-def test_large(tmp_path: PosixPath) -> None:
+def test_large(tmp_path: Path) -> None:
     """succeeded prepatch"""
     _write_png(tmp_path, XDIM, YDIM)
 
 
-def test_2gpx(tmp_path: PosixPath) -> None:
+def test_2gpx(tmp_path: Path) -> None:
     """failed prepatch"""
     _write_png(tmp_path, XDIM, XDIM)

Tests/helper.py

@@ -25,13 +25,6 @@
     uploader = "show"
 elif "GITHUB_ACTIONS" in os.environ:
     uploader = "github_actions"
-else:
-    try:
-        import test_image_results
-
-        uploader = "aws"
-    except ImportError:
-        pass
 
 
 def upload(a: Image.Image, b: Image.Image) -> str | None:
@@ -46,8 +39,6 @@ def upload(a: Image.Image, b: Image.Image) -> str | None:
         a.save(os.path.join(tmpdir, "a.png"))
         b.save(os.path.join(tmpdir, "b.png"))
         return tmpdir
-    elif uploader == "aws":
-        return test_image_results.upload(a, b)
     return None
 
 

Tests/test_000_sanity.py

@@ -3,7 +3,7 @@
 from PIL import Image
 
 
-def test_sanity():
+def test_sanity() -> None:
     # Make sure we have the binary extension
     Image.core.new("L", (100, 100))
 

Tests/test_binary.py

@@ -3,20 +3,20 @@
 from PIL import _binary
 
 
-def test_standard():
+def test_standard() -> None:
     assert _binary.i8(b"*") == 42
     assert _binary.o8(42) == b"*"
 
 
-def test_little_endian():
+def test_little_endian() -> None:
     assert _binary.i16le(b"\xff\xff\x00\x00") == 65535
     assert _binary.i32le(b"\xff\xff\x00\x00") == 65535
 
     assert _binary.o16le(65535) == b"\xff\xff"
     assert _binary.o32le(65535) == b"\xff\xff\x00\x00"
 
 
-def test_big_endian():
+def test_big_endian() -> None:
     assert _binary.i16be(b"\x00\x00\xff\xff") == 0
     assert _binary.i32be(b"\x00\x00\xff\xff") == 65535
 

Tests/test_file_cur.py

@@ -7,7 +7,7 @@
 TEST_FILE = "Tests/images/deerstalker.cur"
 
 
-def test_sanity():
+def test_sanity() -> None:
     with Image.open(TEST_FILE) as im:
         assert im.size == (32, 32)
         assert isinstance(im, CurImagePlugin.CurImageFile)
@@ -17,7 +17,7 @@ def test_sanity():
         assert im.getpixel((16, 16)) == (84, 87, 86, 255)
 
 
-def test_invalid_file():
+def test_invalid_file() -> None:
     invalid_file = "Tests/images/flower.jpg"
 
     with pytest.raises(SyntaxError):