From e8c82ee4b6dda7ac5ada48478dddd99876894da6 Mon Sep 17 00:00:00 2001 From: "James R. Barlow" Date: Tue, 19 Sep 2023 14:08:29 -0700 Subject: [PATCH] Remove shim for img2pdf < 0.4.4 --- pyproject.toml | 2 +- src/ocrmypdf/helpers.py | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 269d7ad3..734ea8c9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,7 @@ requires-python = ">=3.9" dependencies = [ "Pillow>=8.2.0", "deprecation>=2.1.0", - "img2pdf>=0.3.0", # pure Python + "img2pdf>=0.4.4", "packaging>=20", "pdfminer.six>=20201018", "pikepdf>=5.0.1", diff --git a/src/ocrmypdf/helpers.py b/src/ocrmypdf/helpers.py index 8a8e0c40..2ab3392c 100644 --- a/src/ocrmypdf/helpers.py +++ b/src/ocrmypdf/helpers.py @@ -19,18 +19,10 @@ from typing import Any, Generic, Sequence, SupportsFloat, SupportsRound, TypeVar import img2pdf import pikepdf -from packaging.version import Version log = logging.getLogger(__name__) -if Version(img2pdf.__version__) < Version('0.4.0'): - IMG2PDF_KWARGS = dict(without_pdfw=True) -elif Version(img2pdf.__version__) < Version('0.4.3'): - IMG2PDF_KWARGS = dict(engine=img2pdf.Engine.pikepdf) -else: - IMG2PDF_KWARGS = dict( - engine=img2pdf.Engine.pikepdf, rotation=img2pdf.Rotation.ifvalid - ) +IMG2PDF_KWARGS = dict(engine=img2pdf.Engine.pikepdf, rotation=img2pdf.Rotation.ifvalid) T = TypeVar('T', bound=SupportsRound[Any])