Merge branch 'main' into main

Author: Lucas-C

.pre-commit-config.yaml

@@ -18,7 +18,7 @@ repos:
     -   id: check-added-large-files
         args: ['--maxkb=1000']
 -   repo: https://github.com/psf/black
-    rev: 24.10.0
+    rev: 25.1.0
     hooks:
     -   id: black
         args: [--target-version, py36]
@@ -28,13 +28,13 @@ repos:
     -   id: blacken-docs
         additional_dependencies: [black==22.1.0]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.5
     hooks:
     -   id: ruff
         args: ['--fix']
         exclude: "tests/"
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.19.0
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
         args: [--py36-plus]
@@ -45,7 +45,7 @@ repos:
         args: ["--ignore", "E,W,F"]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.13.0'
+    rev: 'v1.15.0'
     hooks:
       - id: mypy
         files: ^pdfly/.*

make_release.py

@@ -259,8 +259,8 @@ def get_formatted_changes(git_tag: str) -> Tuple[str, str]:
     if grouped:
         output += "\n### Other\n"
         output_with_user += "\n### Other\n"
-        for prefix in grouped:
-            for commit_dict in grouped[prefix]:
+        for prefix, commit_dicts in grouped.items():
+            for commit_dict in commit_dicts:
                 output += f"- {prefix}: {commit_dict['msg']}\n"
                 output_with_user += f"- {prefix}: {commit_dict['msg']} by @{commit_dict['author']}\n"
 

pdfly/cli.py

@@ -284,7 +284,9 @@ def update_offsets(
             resolve_path=True,
         ),
     ],
-    file_out: Path = typer.Option(None, "-o", "--output"),
+    file_out: Annotated[
+        Path, typer.Option("-o", "--output")  # noqa
+    ] = None,  # type: ignore
     encoding: str = typer.Option(
         "ISO-8859-1",
         help="Encoding used to read and write the files, e.g. UTF-8.",

pyproject.toml

@@ -87,8 +87,6 @@ ignore = [
     "N806",  # Variable `NO` in function should be lowercase
     "N814", # Camelcase `PageAttributes` imported as constant `PG`
     "N817",  # CamelCase `PagesAttributes` imported as acronym `PA`
-    "ANN101",  # annotating 'self' seems weird (at least before 3.11)
-    "ANN102",  # Missing type annotation for `cls` in classmethod
     "ANN204", # Missing return type annotation for special method `__init__`
     "ANN401",  # Dynamically typed expressions (typing.Any) are disallowed
     "BLE",  # we want to capture Exception sometimes

resources/file-with-invalid-offsets.pdf

@@ -8,7 +8,7 @@
 with open(VERSIONFILE) as fp:
     verstrline = fp.read()
 VSRE = r"^__version__ = ['\"]([^'\"]*)['\"]"
-mo = re.search(VSRE, verstrline, re.M)
+mo = re.search(VSRE, verstrline, re.MULTILINE)
 if mo:
     verstr = mo.group(1)
 else:

setup.py

@@ -14,29 +14,25 @@
 
 def test_update_offsets(capsys, tmp_path: Path) -> None:
     # Arrange
-    input = str(RESOURCES_ROOT / "file-with-invalid-offsets.pdf")
+    input = RESOURCES_ROOT / "file-with-invalid-offsets.pdf"
     file_expected = str(RESOURCES_ROOT / "file-with-fixed-offsets.pdf")
-    output = tmp_path / "file-with-offsets-out.pdf"
-    assert not output.exists()
 
     # Act
     exit_code = run_cli(
         [
             "update-offsets",
             str(input),
-            str(output),
         ]
     )
 
     # Assert
     captured = capsys.readouterr()
     assert exit_code == 0, captured
     assert not captured.err
-    assert re.search(r"Wrote\s+" + re.escape(str(output)), captured.out)
-    assert output.exists()
+    assert re.search(r"Wrote\s+" + re.escape(str(input)), captured.out)
     with open(file_expected, encoding="iso-8859-1") as file_exp:
         lines_exp = file_exp.readlines()
-    with open(output, encoding="iso-8859-1") as file_act:
+    with input.open(encoding="iso-8859-1") as file_act:
         lines_act = file_act.readlines()
     assert len(lines_exp) == len(
         lines_act
@@ -92,6 +88,7 @@ def test_update_offsets_on_all_reference_files(
             "--encoding",
             "iso-8859-1",
             input_pdf_filepath,
+            "-o",
             str(output_pdf_filepath),
         ]
     )