Bump pre-commit hooks & fix new lints (#1204)

Author: robsdedude

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v5.0.0
     hooks:
       - id: check-case-conflict
       - id: check-docstring-first
@@ -27,14 +27,14 @@ repos:
         types_or: [ python, pyi ]
         language: system
   - repo: https://github.com/sphinx-contrib/sphinx-lint
-    rev: e83a1a42a73284d301c05baaffc176042ffbcf82
+    rev: ff671d6a030a3141634793e6d1e8909ab6091830
     hooks:
       - id: sphinx-lint
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.4
+    rev: v0.11.12
     hooks:
       - id: ruff-format
-      - id: ruff
+      - id: ruff-check
         args: [ --fix ]
       - id: ruff-format
   - repo: local

pyproject.toml

@@ -266,6 +266,10 @@ extend-ignore = [
     "RET507",
     "RET508",
 
+    # prefer to not use forward references in typing.cast calls
+    # (worse IDE support => worse DX)
+    "TC006",
+
     "PERF203",  # try-except within loop is fine. Especially in a retry scenario
 
     # too noisy and opinionated FURB lints
@@ -329,7 +333,7 @@ select = [
     # check return statements
     "RET",
     # check type-checking usage
-    "TCH",
+    "TC",
     # copyright notice
     "CPY",
     # check shebangs
@@ -349,6 +353,7 @@ select = [
 ]
 "tests/integration/examples/**" = [
     "T20",  # print statements are part of the examples
+    "LOG015",  # examples are simplified => they may use non-polished logging calls
 ]
 "tests/unit/**" = [
     "PLW1641",  # no need for production grade test code
@@ -376,3 +381,6 @@ notice-rgx = "# Copyright \\(c\\) \"Neo4j\""
 
 [tool.ruff.lint.pydocstyle]
 convention = "pep257"
+
+[tool.ruff.lint.flake8-pytest-style]
+warns-extend-require-match-for = ["neo4j.warning.PreviewWarning"]

src/neo4j/__init__.py

@@ -76,12 +76,12 @@
 
 
 if _t.TYPE_CHECKING:
-    from ._api import NotificationDisabledClassification  # noqa: TCH004 false positive (dynamic attribute)
+    from ._api import NotificationDisabledClassification
     from ._work import (
-        GqlStatusObject,  # noqa: TCH004 false positive (dynamic attribute)
-        NotificationClassification,  # noqa: TCH004 false positive (dynamic attribute)
+        GqlStatusObject,
+        NotificationClassification,
     )
-    from ._warnings import PreviewWarning  # noqa: TCH004 false positive (dynamic attribute)
+    from ._warnings import PreviewWarning
 
 from ._addressing import (
     Address,

src/neo4j/_async/auth_management.py

@@ -32,8 +32,8 @@
     ExpiringAuth,
 )
 
-# ignore TCH001 to make sphinx not completely drop the ball
-from ..api import _TAuth  # noqa: TCH001
+# ignore TC001 to make sphinx not completely drop the ball
+from ..api import _TAuth  # noqa: TC001
 
 
 if t.TYPE_CHECKING:

src/neo4j/_async/bookmark_manager.py

@@ -26,7 +26,7 @@
 
 
 TBmSupplier = t.Callable[[], Bookmarks | t.Awaitable[Bookmarks]]
-TBmConsumer = t.Callable[[Bookmarks], None | t.Awaitable[None]]
+TBmConsumer = t.Callable[[Bookmarks], t.Awaitable[None] | None]
 
 
 class AsyncNeo4jBookmarkManager(AsyncBookmarkManager):

src/neo4j/_async/driver.py

@@ -573,10 +573,10 @@ def session(self, **config) -> AsyncSession:
             .. versionchanged:: 6.0
                 Raise :exc:`DriverError` if the driver has been closed.
             """
-            if "warn_notification_severity" in config:
-                # Would work just fine, but we don't want to introduce yet
-                # another undocumented/unsupported config option.
-                del config["warn_notification_severity"]
+            # Would work just fine, but we don't want to introduce yet
+            # another undocumented/unsupported config option.
+            config.pop("warn_notification_severity", None)
+
             self._check_state()
             if "notifications_disabled_classifications" in config:
                 preview_warn(
@@ -663,8 +663,8 @@ async def execute_query(
         bookmark_manager_: (
             AsyncBookmarkManager
             | BookmarkManager
-            | None
             | t.Literal[_DefaultEnum.default]
+            | None
         ) = _default,
         auth_: _TAuth = None,
         result_transformer_: t.Callable[

src/neo4j/_async/io/_bolt.py

@@ -1053,7 +1053,7 @@ def tx_timeout_as_ms(timeout: float) -> int:
         raise err_type(msg) from None
     if timeout < 0:
         raise ValueError("Timeout must be a positive number or 0.")
-    ms = int(round(1000 * timeout))
+    ms = round(1000 * timeout)
     if ms == 0 and timeout > 0:
         # Special case for 0 < timeout < 0.5 ms.
         # This would be rounded to 0 ms, but the server interprets this as

src/neo4j/_async/io/_bolt_socket.py

@@ -95,7 +95,7 @@ async def _parse_handshake_response_v2(
             offering = offering_response[-1:-4:-1]
             offerings.append(offering)
         ctx.ctx = "handshake v2 capabilities"
-        _capabilities_offer = await self._read_varint(ctx)
+        capabilities_offer = await self._read_varint(ctx)
 
         if log.getEffectiveLevel() <= logging.DEBUG:
             log.debug(
@@ -106,7 +106,7 @@ async def _parse_handshake_response_v2(
                 " ".join(
                     f"0x{vx[2]:04X}{vx[1]:02X}{vx[0]:02X}" for vx in offerings
                 ),
-                BytesPrinter(self._encode_varint(_capabilities_offer)),
+                BytesPrinter(self._encode_varint(capabilities_offer)),
             )
 
         supported_versions = sorted(self.Bolt.protocol_handlers.keys())

src/neo4j/_async/io/_pool.py

@@ -300,8 +300,7 @@ async def _re_auth_connection(self, connection, auth, force, unprepared):
             )
         except Exception as exc:
             log.debug(
-                "[#%04X]  _: <POOL> check re_auth failed %r auth=%s "
-                "force=%s",
+                "[#%04X]  _: <POOL> check re_auth failed %r auth=%s force=%s",
                 connection.local_port,
                 exc,
                 log_auth,
@@ -881,8 +880,7 @@ async def fetch_routing_table(
         # No readers
         if num_readers == 0:
             log.debug(
-                "[#0000]  _: <POOL> no read servers returned from "
-                "server %s",
+                "[#0000]  _: <POOL> no read servers returned from server %s",
                 address,
             )
             return None

src/neo4j/_async/work/result.py

@@ -101,7 +101,7 @@ class AsyncResult(AsyncNonConcurrentMethodChecker):
     """
 
     _creation_stack: list[inspect.FrameInfo] | None
-    _creation_frame_cache: None | t.Literal[False] | inspect.FrameInfo
+    _creation_frame_cache: t.Literal[False] | inspect.FrameInfo | None
 
     def __init__(
         self,

src/neo4j/_async/work/transaction.py

@@ -18,7 +18,7 @@
 
 import asyncio
 
-from ... import _typing as t  # noqa: TCH001
+from ... import _typing as t  # noqa: TC001
 from ..._async_compat.util import AsyncUtil
 from ..._work import Query
 from ...exceptions import TransactionError

src/neo4j/_async_compat/concurrency.py

@@ -21,7 +21,7 @@
 import re
 import threading
 
-from .. import _typing as t  # noqa: TCH001
+from .. import _typing as t  # noqa: TC001
 from .shims import wait_for
 
 

src/neo4j/_auth_management.py

@@ -20,8 +20,8 @@
 import time
 from dataclasses import dataclass
 
-# ignore TCH003 to make sphinx not completely drop the ball
-from os import PathLike  # noqa: TCH003
+# ignore TC003 to make sphinx not completely drop the ball
+from os import PathLike  # noqa: TC003
 
 from . import _typing as t
 from .api import (

src/neo4j/_codec/hydration/v1/temporal.py

@@ -221,8 +221,7 @@ def dehydrate_np_datetime(value):
             # while we could encode years outside the range, they would fail
             # when retrieved from the database.
             raise ValueError(
-                f"Year out of range ({MIN_YEAR:d}..{MAX_YEAR:d}) "
-                f"found {year}"
+                f"Year out of range ({MIN_YEAR:d}..{MAX_YEAR:d}) found {year}"
             )
         seconds = value.astype(np.dtype("datetime64[s]")).astype(int)
         nanoseconds = (

src/neo4j/_debug/_notification_printer.py

@@ -50,9 +50,9 @@ def __str__(self):
         if pos.line <= 0 or pos.line > len(query_lines) or pos.column <= 0:
             return s + self.query
         query_lines = (
-            query_lines[: pos.line]
-            + [" " * (pos.column - 1) + "^"]
-            + query_lines[pos.line :]
+            *query_lines[: pos.line],
+            " " * (pos.column - 1) + "^",
+            *query_lines[pos.line :],
         )
         s += "\n".join(query_lines)
         return s

src/neo4j/_io/__init__.py

@@ -16,7 +16,7 @@
 
 from __future__ import annotations
 
-from .. import _typing as t  # noqa: TCH001
+from .. import _typing as t  # noqa: TC001
 
 
 __all__ = [

src/neo4j/_meta.py

@@ -62,9 +62,9 @@ def format_version_info(version_info):
 
 def _compute_user_agent() -> str:
     return (
-        f'{BOLT_AGENT_DICT["product"]} '
-        f'{BOLT_AGENT_DICT["language"]} '
-        f'({sys.platform})'
+        f"{BOLT_AGENT_DICT['product']} "
+        f"{BOLT_AGENT_DICT['language']} "
+        f"({sys.platform})"
     )
 
 

src/neo4j/_optional_deps/__init__.py

@@ -18,7 +18,7 @@
 
 from contextlib import suppress
 
-from .. import _typing as t  # noqa: TCH001
+from .. import _typing as t  # noqa: TC001
 
 
 np: t.Any = None

src/neo4j/_sync/auth_management.py

@@ -90,9 +90,9 @@
 )
 
 if TYPE_CHECKING:
-    from typing_extensions import NotRequired  # Python 3.11+  # noqa: TCH004
-    from typing_extensions import Self  # Python 3.11  # noqa: TCH004
-    from typing_extensions import (  # Python 3.11  # noqa: TCH004 Python
+    from typing_extensions import NotRequired  # Python 3.11+  # noqa: TC004
+    from typing_extensions import Self  # Python 3.11  # noqa: TC004
+    from typing_extensions import (  # Python 3.11  # noqa: TC004 Python
         LiteralString,
     )
 

src/neo4j/_sync/bookmark_manager.py

@@ -19,8 +19,8 @@
 import itertools
 import typing as t
 
-# ignore TCH003 to make sphinx not completely drop the ball
-from collections.abc import Sequence  # noqa: TCH003
+# ignore TC003 to make sphinx not completely drop the ball
+from collections.abc import Sequence  # noqa: TC003
 from copy import deepcopy
 from dataclasses import dataclass