Merge branch 'next' into python314

Author: stefan6419846

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Development Version
 
 * Allow setting the maximum image pixel size for *Pillow* in `hocr_pdf`.
+* Drop support for Python <= 3.9.
 
 # Version 1.2.0 - 2025-07-01
 

pyproject.toml

@@ -28,7 +28,7 @@ keywords = [
     "hocr",
     "xhtml",
 ]
-requires-python = ">=3.9, <4"
+requires-python = ">=3.10, <4"
 dependencies = [
     "Pillow>=9.3.0",
     "lxml>=3.5.0",
@@ -49,7 +49,6 @@ dev = [
     "beautifulsoup4",
     "requests",
     "pypdf",
-    "importlib-resources; python_version < '3.10'",
     # Linting.
     "flake8",
     "flake8-bugbear",

requirements.txt

@@ -1,8 +1,8 @@
 # Ensure that we always test against the latest versions
 # as soon as they get released by pinning them here and
 # letting `dependabot` update them for new releases.
-Pillow==11.3.0
+Pillow==12.0.0
 lxml==6.0.2
 python-bidi==0.6.6
 reportlab==4.4.4
-pypdf==6.1.1
+pypdf==6.1.2

tests/__init__.py

@@ -4,34 +4,29 @@
 import shutil
 import sys
 from contextlib import ExitStack
+from importlib import resources
 from pathlib import Path
-from typing import cast
 from unittest import TestCase as _TestCase
 
-if sys.version_info < (3, 10):
-    import importlib_resources
-else:
-    import importlib.resources as importlib_resources
-
 
 class TestCase(_TestCase):
     @classmethod
     def get_data_file(cls, path: str) -> str:
         file_manager = ExitStack()
         atexit.register(file_manager.close)
-        reference = importlib_resources.files("tests.data") / path
+        reference = resources.files("tests.data") / path
         return str(file_manager.enter_context(
-            importlib_resources.as_file(reference)
+            resources.as_file(reference)
         ))
 
     @classmethod
     def get_data_content(cls, path: str) -> bytes:
-        reference = importlib_resources.files("tests.data") / path
-        return cast(bytes, reference.read_bytes())  # type: ignore[redundant-cast,unused-ignore]  # `cast` only required for Python < 3.10.
+        reference = resources.files("tests.data") / path
+        return reference.read_bytes()
 
     @classmethod
     def get_data_directory(cls) -> Path:
-        first_file = next(importlib_resources.files("tests.data").iterdir())
+        first_file = next(resources.files("tests.data").iterdir())
         return Path(cls.get_data_file(first_file.name)).parent
 
     @classmethod