Update Ruff

Author: hynek

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.11
+    rev: v0.13.0
     hooks:
       - id: ruff-check
         args: [--fix, --exit-non-zero-on-fix]

src/structlog/stdlib.py

@@ -130,7 +130,7 @@ def findCaller(
         This logger gets set as the default one when using LoggerFactory.
         """
         sinfo: str | None
-        f, name = _find_first_app_frame_and_name(["logging"])
+        f, _name = _find_first_app_frame_and_name(["logging"])
         sinfo = _format_stack(f) if stack_info else None
 
         return f.f_code.co_filename, f.f_lineno, f.f_code.co_name, sinfo

tests/processors/test_renderers.py

@@ -377,9 +377,7 @@ def test_disallows_non_utc_unix_timestamps(self):
         A asking for a UNIX timestamp with a timezone that's not UTC raises a
         ValueError.
         """
-        with pytest.raises(
-            ValueError, match="UNIX timestamps are always UTC."
-        ):
+        with pytest.raises(ValueError, match="UNIX timestamps are always UTC"):
             TimeStamper(utc=False)
 
     def test_inserts_utc_unix_timestamp_by_default(self):

tests/test_dev.py

@@ -602,7 +602,7 @@ def test_enforces_presence_of_exactly_one_default_formatter(self):
 
         with pytest.raises(
             ValueError,
-            match="Only one default column formatter allowed.",
+            match="Only one default column formatter allowed",
         ):
             dev.ConsoleRenderer(
                 columns=[
@@ -657,7 +657,7 @@ def test_rich_traceback_formatter_no_rich():
     """
     with pytest.raises(
         ModuleNotFoundError,
-        match="RichTracebackFormatter requires Rich to be installed.",
+        match="RichTracebackFormatter requires Rich to be installed",
     ):
         dev.rich_traceback(StringIO(), sys.exc_info())
 

tests/test_output.py

@@ -102,7 +102,7 @@ def test_pickle_not_stdout_stderr(self, logger_cls, tmpdir, proto):
         f.write("")
         pl = logger_cls(file=f.open())
 
-        with pytest.raises(pickle.PicklingError, match="Only (.+)Loggers to"):
+        with pytest.raises(pickle.PicklingError, match=r"Only (.+)Loggers to"):
             pickle.dumps(pl, proto)
 
     def test_deepcopy(self, logger_cls, capsys):

tests/test_stdlib.py

@@ -117,7 +117,7 @@ def test_deduces_correct_caller(self):
         """
         logger = _FixedFindCallerLogger("test")
 
-        file_name, line_number, func_name = logger.findCaller()[:3]
+        file_name, _line_number, func_name = logger.findCaller()[:3]
 
         assert file_name == os.path.realpath(__file__)
         assert func_name == "test_deduces_correct_caller"
@@ -127,7 +127,7 @@ def test_stack_info(self):
         If we ask for stack_info, it will returned.
         """
         logger = _FixedFindCallerLogger("test")
-        testing, is_, fun, stack_info = logger.findCaller(stack_info=True)
+        testing, is_, fun, stack_info = logger.findCaller(stack_info=True)  # noqa: RUF059
 
         assert "testing, is_, fun" in stack_info
 
@@ -136,7 +136,7 @@ def test_no_stack_info_by_default(self):
         If we don't ask for stack_info, it won't be returned.
         """
         logger = _FixedFindCallerLogger("test")
-        testing, is_, fun, stack_info = logger.findCaller()
+        testing, is_, fun, stack_info = logger.findCaller()  # noqa: RUF059
 
         assert None is stack_info
 
@@ -230,7 +230,7 @@ def test_positional_args_proxied(self):
         Positional arguments supplied are proxied as kwarg.
         """
         bl = BoundLogger(ReturnLogger(), [], {})
-        args, kwargs = bl.debug("event", "foo", bar="baz")
+        _args, kwargs = bl.debug("event", "foo", bar="baz")
 
         assert "baz" == kwargs.get("bar")
         assert ("foo",) == kwargs.get("positional_args")

tests/test_twisted.py

@@ -105,7 +105,7 @@ def test_extractFailsOnTwoFailures(self):
         """
         with pytest.raises(
             ValueError,
-            match="Both _stuff and event contain an Exception/Failure.",
+            match="Both _stuff and event contain an Exception/Failure",
         ):
             _extractStuffAndWhy(
                 {
@@ -119,7 +119,7 @@ def test_failsOnConflictingEventAnd_why(self):
         Raise ValueError if both _why and event are in the event_dict.
         """
         with pytest.raises(
-            ValueError, match="Both `_why` and `event` supplied."
+            ValueError, match="Both `_why` and `event` supplied"
         ):
             _extractStuffAndWhy({"_why": "foo", "event": "bar"})
 
@@ -222,7 +222,7 @@ def test_catchesConflictingEventAnd_why(self):
         la = EventAdapter(_render_repr)
 
         with pytest.raises(
-            ValueError, match="Both `_why` and `event` supplied."
+            ValueError, match="Both `_why` and `event` supplied"
         ):
             la(None, "err", {"event": "someEvent", "_why": "someReason"})