Drop support for Python 3.10

.github/compare-dist-sizes.py

@@ -10,7 +10,7 @@
 """
 
 # /// script
-# requires-python = ">=3.10"
+# requires-python = ">=3.11"
 # dependencies = [
 #     "humanize",
 #     "prettytable",

.github/generate-sbom.py

@@ -59,7 +59,7 @@ def upstream_diff_b64(
 
 def generate(version: str) -> dict:
     serial = str(uuid.uuid4())
-    now = dt.datetime.now(dt.timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
+    now = dt.datetime.now(dt.UTC).strftime("%Y-%m-%dT%H:%M:%SZ")
     purl = f"pkg:pypi/pillow@{version}"
     root = Path(__file__).parent.parent
     thirdparty = root / "src" / "thirdparty"

.github/workflows/test-docker.yml

@@ -47,7 +47,6 @@ jobs:
           fedora-43-amd64,
           fedora-44-amd64,
           gentoo,
-          ubuntu-22.04-jammy-amd64,
           ubuntu-24.04-noble-amd64,
           ubuntu-26.04-resolute-amd64,
         ]

.github/workflows/test-valgrind-memory.yml

@@ -38,11 +38,12 @@ jobs:
       fail-fast: false
       matrix:
         docker: [
-          ubuntu-22.04-jammy-amd64-valgrind,
+          ubuntu-24.04-noble-amd64-valgrind,
         ]
         dockerTag: [main]
+        split: [1, 2, 3, 4]
 
-    name: ${{ matrix.docker }}
+    name: ${{ matrix.docker }} ${{ matrix.split }}
 
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -60,5 +61,5 @@ jobs:
       run: |
         # The Pillow user in the docker container is UID 1001
         sudo chown -R 1001 $GITHUB_WORKSPACE
-        docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} /Pillow/depends/docker-test-valgrind-memory.sh
+        docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -e "SPLIT_COUNT=4" -e "SPLIT_INDEX=${{ matrix.split }}" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }} /Pillow/depends/docker-test-valgrind-memory.sh
         sudo chown -R runner $GITHUB_WORKSPACE

.github/workflows/test-valgrind.yml

@@ -32,11 +32,12 @@ jobs:
       fail-fast: false
       matrix:
         docker: [
-          ubuntu-22.04-jammy-amd64-valgrind,
+          ubuntu-24.04-noble-amd64-valgrind,
         ]
         dockerTag: [main]
+        split: [1, 2, 3, 4]
 
-    name: ${{ matrix.docker }}
+    name: ${{ matrix.docker }} ${{ matrix.split }}
 
     steps:
     - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
@@ -54,5 +55,5 @@ jobs:
       run: |
         # The Pillow user in the docker container is UID 1001
         sudo chown -R 1001 $GITHUB_WORKSPACE
-        docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
+        docker run --name pillow_container -e "PILLOW_VALGRIND_TEST=true" -e "SPLIT_COUNT=4" -e "SPLIT_INDEX=${{ matrix.split }}" -v $GITHUB_WORKSPACE:/Pillow pythonpillow/${{ matrix.docker }}:${{ matrix.dockerTag }}
         sudo chown -R runner $GITHUB_WORKSPACE

.github/workflows/test-windows.yml

@@ -30,12 +30,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["pypy3.11", "3.11", "3.12", "3.13", "3.14", "3.15"]
+        python-version: ["pypy3.11", "3.12", "3.13", "3.14", "3.15"]
         architecture: ["x64"]
         os: ["windows-latest"]
         include:
             # Test the oldest Python on 32-bit
-            - { python-version: "3.10", architecture: "x86", os: "windows-2022" }
+            - { python-version: "3.11", architecture: "x86", os: "windows-2022" }
 
     timeout-minutes: 45
 

.github/workflows/test.yml

@@ -44,15 +44,14 @@ jobs:
           "3.13",
           "3.12",
           "3.11",
-          "3.10",
         ]
         include:
-        - { python-version: "3.12", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" }
-        - { python-version: "3.11", PYTHONOPTIMIZE: 2 }
+        - { python-version: "3.13", PYTHONOPTIMIZE: 1, REVERSE: "--reverse" }
+        - { python-version: "3.12", PYTHONOPTIMIZE: 2 }
         # Intel
-        - { os: "macos-26-intel", python-version: "3.10" }
+        - { os: "macos-26-intel", python-version: "3.11" }
         exclude:
-        - { os: "macos-latest", python-version: "3.10" }
+        - { os: "macos-latest", python-version: "3.11" }
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.os }} Python ${{ matrix.python-version }}

.github/workflows/wheels.yml

@@ -37,7 +37,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  EXPECTED_DISTS: 87
+  EXPECTED_DISTS: 78
   FORCE_COLOR: 1
 
 jobs:
@@ -81,7 +81,7 @@ jobs:
             platform: macos
             os: macos-26-intel
             cibw_arch: x86_64
-            build: "cp3{10,11}*"
+            build: "cp311*"
             macosx_deployment_target: "10.10"
           - name: "macOS 10.13 x86_64"
             platform: macos

Makefile

@@ -114,7 +114,7 @@ valgrind-leak:
 	PILLOW_VALGRIND_TEST=true PYTHONMALLOC=malloc valgrind --suppressions=Tests/oss-fuzz/python.supp \
 	    --leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite \
             --log-file=/tmp/valgrind-output \
-            python3 -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output
+            python3 -m pytest -vv --valgrind --valgrind-log=/tmp/valgrind-output $(PYTEST_ARGS)
 
 .PHONY: readme
 readme:

Tests/test_bmp_reference.py

@@ -21,9 +21,7 @@ def test_bad() -> None:
     either"""
     for f in get_files("b"):
         # Assert that there is no unclosed file warning
-        with warnings.catch_warnings():
-            warnings.simplefilter("error")
-
+        with warnings.catch_warnings(action="error"):
             try:
                 with Image.open(f) as im:
                     im.load()
@@ -56,7 +54,7 @@ def test_questionable() -> None:
                 im.load()
             if os.path.basename(f) not in supported:
                 print(f"Please add {f} to the partially supported bmp specs.")
-        except Exception:  # noqa: PERF203
+        except Exception:
             if os.path.basename(f) in supported:
                 raise
 
@@ -106,7 +104,7 @@ def get_compare(f: str) -> str:
 
                     assert_image_similar(im_converted, compare_converted, 5)
 
-        except Exception as msg:  # noqa: PERF203
+        except Exception as msg:
             # there are three here that are unsupported:
             unsupported = (
                 os.path.join(base, "g", "rgb32bf.bmp"),

Tests/test_file_avif.py

@@ -208,9 +208,7 @@ def finish(self) -> None:
 
     def test_no_resource_warning(self, tmp_path: Path) -> None:
         with Image.open(TEST_AVIF_FILE) as im:
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-
+            with warnings.catch_warnings(action="error"):
                 im.save(tmp_path / "temp.avif")
 
     @pytest.mark.parametrize("major_brand", [b"avif", b"avis", b"mif1", b"msf1"])
@@ -603,7 +601,7 @@ def test_svt_optimizations(self, tmp_path: Path) -> None:
 @skip_unless_feature("avif")
 class TestAvifAnimation:
     @contextmanager
-    def star_frames(self) -> Generator[list[Image.Image], None, None]:
+    def star_frames(self) -> Generator[list[Image.Image]]:
         with Image.open("Tests/images/avif/star.png") as f:
             yield [f, f.rotate(90), f.rotate(180), f.rotate(270)]
 
@@ -676,7 +674,7 @@ def check(temp_file: Path) -> None:
             # Test appending using a generator
             def imGenerator(
                 ims: list[Image.Image],
-            ) -> Generator[Image.Image, None, None]:
+            ) -> Generator[Image.Image]:
                 yield from ims
 
             temp_file2 = tmp_path / "temp_generator.avif"

Tests/test_file_dcx.py

@@ -35,18 +35,14 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(TEST_FILE) as im:
             im.load()
 

Tests/test_file_fli.py

@@ -73,9 +73,7 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(static_test_file)
         im.load()
         im.close()
@@ -91,9 +89,7 @@ def test_seek_after_close() -> None:
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(static_test_file) as im:
             im.load()
 

Tests/test_file_gif.py

@@ -43,9 +43,7 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(TEST_GIF)
         im.load()
         im.close()
@@ -66,9 +64,7 @@ def test_seek_after_close() -> None:
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(TEST_GIF) as im:
             im.load()
 
@@ -1191,7 +1187,7 @@ def test_append_images(tmp_path: Path) -> None:
         assert reread.n_frames == 3
 
     # Tests appending using a generator
-    def im_generator(ims: list[Image.Image]) -> Generator[Image.Image, None, None]:
+    def im_generator(ims: list[Image.Image]) -> Generator[Image.Image]:
         yield from ims
 
     im.save(out, save_all=True, append_images=im_generator(ims))

Tests/test_file_icns.py

@@ -20,9 +20,7 @@ def test_sanity() -> None:
     # (512x512@2x) being loaded
     with Image.open(TEST_FILE) as im:
         # Assert that there is no unclosed file warning
-        with warnings.catch_warnings():
-            warnings.simplefilter("error")
-
+        with warnings.catch_warnings(action="error"):
             im.load()
 
         assert im.mode == "RGBA"

Tests/test_file_im.py

@@ -40,18 +40,14 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(TEST_IM)
         im.load()
         im.close()
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(TEST_IM) as im:
             im.load()
 

Tests/test_file_jpeg.py

@@ -880,9 +880,7 @@ def test_exif_x_resolution(self, tmp_path: Path) -> None:
             assert exif[282] == 180
 
             out = tmp_path / "out.jpg"
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-
+            with warnings.catch_warnings(action="error"):
                 im.save(out, exif=exif)
 
         with Image.open(out) as reloaded:

Tests/test_file_jpeg2k.py

@@ -33,7 +33,7 @@
 
 
 @pytest.fixture
-def card() -> Generator[ImageFile.ImageFile, None, None]:
+def card() -> Generator[ImageFile.ImageFile]:
     with Image.open("Tests/images/test-card.png") as im:
         im.load()
     try:

Tests/test_file_mpo.py

@@ -59,9 +59,7 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(test_files[0])
         im.load()
         im.close()
@@ -76,9 +74,7 @@ def test_seek_after_close() -> None:
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(test_files[0]) as im:
             im.load()
 

Tests/test_file_pdf.py

@@ -164,7 +164,7 @@ def test_save_all(tmp_path: Path) -> None:
         assert os.path.getsize(outfile) > 0
 
         # Test appending using a generator
-        def im_generator(ims: list[Image.Image]) -> Generator[Image.Image, None, None]:
+        def im_generator(ims: list[Image.Image]) -> Generator[Image.Image]:
             yield from ims
 
         im.save(outfile, save_all=True, append_images=im_generator(ims))

Tests/test_file_png.py

@@ -367,9 +367,7 @@ def test_load_verify(self) -> None:
 
         with Image.open(TEST_PNG_FILE) as im:
             # Assert that there is no unclosed file warning
-            with warnings.catch_warnings():
-                warnings.simplefilter("error")
-
+            with warnings.catch_warnings(action="error"):
                 im.verify()
 
         with Image.open(TEST_PNG_FILE) as im:

Tests/test_file_psd.py

@@ -41,18 +41,14 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(test_file)
         im.load()
         im.close()
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(test_file) as im:
             im.load()
 

Tests/test_file_spider.py

@@ -33,18 +33,14 @@ def open_test_image() -> None:
 
 
 def test_closed_file() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         im = Image.open(TEST_FILE)
         im.load()
         im.close()
 
 
 def test_context_manager() -> None:
-    with warnings.catch_warnings():
-        warnings.simplefilter("error")
-
+    with warnings.catch_warnings(action="error"):
         with Image.open(TEST_FILE) as im:
             im.load()