DEV: Update code style libraries to latest versions (#3460)

Author: stefan6419846

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 # pre-commit run --all-files
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
     -   id: check-ast
     -   id: check-case-conflict
@@ -19,7 +19,7 @@ repos:
         args: ['--maxkb=1000']
 
 -   repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.13.0
     hooks:
     -   id: ruff-check
         args: ['--fix']
@@ -31,7 +31,7 @@ repos:
         args: [--py39-plus]
 
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: 'v1.17.0'
+    rev: v1.17.1
     hooks:
       - id: mypy
         additional_dependencies: [types-Pillow==10.2.0.20240822]

pypdf/_writer.py

@@ -975,7 +975,7 @@ def _update_field_annotation(
         font_res = dr.get(font_name, None)
         if not is_null_or_none(font_res):
             font_res = cast(DictionaryObject, font_res.get_object())
-            font_subtype, _, font_encoding, font_map = build_char_map_from_dict(
+            _font_subtype, _, font_encoding, font_map = build_char_map_from_dict(
                 200, font_res
             )
             try:  # remove width stored in -1 key
@@ -2740,7 +2740,7 @@ def merge(
         if isinstance(fileobj, PdfDocCommon):
             reader = fileobj
         else:
-            stream, encryption_obj = self._create_stream(fileobj)
+            stream, _encryption_obj = self._create_stream(fileobj)
             # Create a new PdfReader instance using the stream
             # (either file or BytesIO or StringIO) created above
             reader = PdfReader(stream, strict=False)  # type: ignore[arg-type]

pypdf/generic/_data_structures.py

@@ -1053,8 +1053,7 @@ def decode_as_image(self) -> Any:
         Returns:
             a PIL image if proper decoding has been found
         Raises:
-            Exception: (any)during decoding to to invalid object or
-                errors during decoding will be reported
+            Exception: Errors during decoding will be reported.
                 It is recommended to catch exceptions to prevent
                 stops in your program.
 
@@ -1067,7 +1066,7 @@ def decode_as_image(self) -> Any:
             except AttributeError:
                 msg = f"{self.__repr__()} object does not seem to be an Image"  # pragma: no cover
             logger_warning(msg, __name__)
-        extension, byte_stream, img = _xobj_to_image(self)
+        extension, _, img = _xobj_to_image(self)
         if extension is None:
             return None  # pragma: no cover
         return img

pyproject.toml

@@ -199,7 +199,6 @@ ignore = [
     "TRY301",  # Abstract `raise` to an inner function
     "UP006",   # Non-PEP 585 annotation. As long as we are not on Python 3.11+
     "UP007",   # Non-PEP 604 annotation. As long as we are not on Python 3.11+
-    "UP038",   # Use `X | Y` in `isinstance` call instead of `(X, Y)` - PEP 604. While not on Python 3.10+
 ]
 
 [tool.ruff.lint.mccabe]

requirements/ci-3.11.txt

@@ -60,7 +60,7 @@ pytest-xdist==3.6.1
     # via -r requirements/ci.in
 pyyaml==6.0.2
     # via -r requirements/ci.in
-ruff==0.12.7
+ruff==0.13.0
     # via -r requirements/ci.in
 tomli==2.0.2
     # via

tests/test_filters.py

@@ -194,7 +194,7 @@ def test_ascii85decode_five_zero_bytes():
 def test_ccitparameters():
     with pytest.raises(
         DeprecationError,
-        match="CCITParameters is deprecated and was removed in pypdf 6.0.0. Use CCITTParameters instead",
+        match=r"CCITParameters is deprecated and was removed in pypdf 6\.0\.0\. Use CCITTParameters instead",
     ):
         CCITParameters()
 
@@ -382,7 +382,7 @@ def test_iss1787():
     obj = data.indirect_reference.get_object()
     obj["/DecodeParms"][NameObject("/Columns")] = NumberObject(1000)
     obj.decoded_self = None
-    with pytest.raises(expected_exception=PdfReadError, match="^Unsupported PNG filter 244$"):
+    with pytest.raises(expected_exception=PdfReadError, match=r"^Unsupported PNG filter 244$"):
         _ = reader.pages[0].images[0]
 
 
@@ -712,7 +712,7 @@ def test_flate_decode__not_rectangular(caplog):
 
 def test_jbig2decode__binary_errors():
     with mock.patch("pypdf.filters.JBIG2DEC_BINARY", None), \
-            pytest.raises(DependencyError, match="jbig2dec binary is not available."):
+            pytest.raises(DependencyError, match=r"jbig2dec binary is not available\."):
         JBIG2Decode.decode(b"dummy")
 
     result = subprocess.CompletedProcess(
@@ -725,7 +725,7 @@ def test_jbig2decode__binary_errors():
     )
     with mock.patch("pypdf.filters.subprocess.run", return_value=result), \
             mock.patch("pypdf.filters.JBIG2DEC_BINARY", "/usr/bin/jbig2dec"), \
-            pytest.raises(DependencyError, match="jbig2dec>=0.15 is required."):
+            pytest.raises(DependencyError, match=r"jbig2dec>=0.15 is required\."):
         JBIG2Decode.decode(b"dummy")
 
 
@@ -785,7 +785,7 @@ def test_jbig2decode__edge_cases(caplog):
     caplog.clear()
 
     # Invalid input.
-    with pytest.raises(PdfStreamError, match="Unable to decode JBIG2 data. Exit code: 1"):
+    with pytest.raises(PdfStreamError, match=r"Unable to decode JBIG2 data\. Exit code: 1"):
         JBIG2Decode.decode(b"aaaaaa")
     assert caplog.messages == [
         "jbig2dec FATAL ERROR page has no image, cannot be completed",

tests/test_generic.py

@@ -200,7 +200,7 @@ def test_name_object(caplog):
 
     with pytest.raises(
         DeprecationError,
-        match="surfix is deprecated and was removed in pypdf 5.0.0. Use prefix instead.",
+        match=r"surfix is deprecated and was removed in pypdf 5\.0\.0\. Use prefix instead\.",
     ):
         _ = NameObject.surfix
 

tests/test_reader.py

@@ -745,15 +745,21 @@ def test_decode_permissions():
     print_["print"] = True
     with pytest.raises(
         DeprecationError,
-        match="decode_permissions is deprecated and was removed in pypdf 5.0.0. Use user_access_permissions instead",
+            match=(
+                r"decode_permissions is deprecated and was removed in pypdf 5\.0\.0\. "
+                r"Use user_access_permissions instead"
+            ),
     ):
         assert reader.decode_permissions(4) == print_
 
     modify = base.copy()
     modify["modify"] = True
     with pytest.raises(
         DeprecationError,
-        match="decode_permissions is deprecated and was removed in pypdf 5.0.0. Use user_access_permissions instead",
+        match=(
+            r"decode_permissions is deprecated and was removed in pypdf 5\.0\.0\. "
+            r"Use user_access_permissions instead"
+        ),
     ):
         assert reader.decode_permissions(8) == modify
 
@@ -1820,7 +1826,7 @@ def test_issue2886(caplog):
     url = "https://github.com/user-attachments/files/17187711/crash-e8a85d82de01cab5eb44e7993304d8b9d1544970.pdf"
     name = "issue2886.pdf"
 
-    with pytest.raises(PdfReadError, match="Unexpected empty line in Xref table."):
+    with pytest.raises(PdfReadError, match=r"Unexpected empty line in Xref table\."):
         _ = PdfReader(BytesIO(get_data_from_url(url, name=name)))
 
 

tests/test_utils.py

@@ -236,7 +236,7 @@ def foo() -> None:
 
     with pytest.raises(
         DeprecationError,
-        match="foo is deprecated and was removed in pypdf 4.3.2.",
+        match=r"foo is deprecated and was removed in pypdf 4\.3\.2\.",
     ):
         foo()
 

tests/test_writer.py

@@ -2671,13 +2671,13 @@ def test_deprecate_with_as():
     with PdfWriter() as writer:
         with pytest.raises(
                 expected_exception=DeprecationError,
-                match="with_as_usage is deprecated and was removed in pypdf 5.0"
+                match=r"with_as_usage is deprecated and was removed in pypdf 5\.0"
         ):
             _ = writer.with_as_usage
 
         with pytest.raises(
                 expected_exception=DeprecationError,
-                match="with_as_usage is deprecated and was removed in pypdf 5.0"
+                match=r"with_as_usage is deprecated and was removed in pypdf 5\.0"
         ):
             writer.with_as_usage = False  # old code allowed setting this, so...