[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

docs/source/conf.py

@@ -321,7 +321,7 @@ def add_mapping(
 
 # General information about the project.
 project = "Trio"
-copyright = "2017, Nathaniel J. Smith"  # noqa: A001 # Name shadows builtin
+copyright = "2017, Nathaniel J. Smith"  # ruff:ignore[builtin-variable-shadowing] # Name shadows builtin
 author = "Nathaniel J. Smith"
 
 # The version info for the project you're documenting, acts as replacement for

pyproject.toml

@@ -146,31 +146,31 @@ select = [
     "YTT",   # flake8-2020
 ]
 extend-ignore = [
-    "A002",    # builtin-argument-shadowing
-    "ANN401",  # any-type (mypy's `disallow_any_explicit` is better)
-    "E402",    # module-import-not-at-top-of-file (usually OS-specific)
-    "E501",    # line-too-long
-    "F403",    # undefined-local-with-import-star
-    "F405",    # undefined-local-with-import-star-usage
-    "PERF203", # try-except-in-loop (not always possible to refactor)
-    "PT012",   # multiple statements in pytest.raises block
-    "SIM117",  # multiple-with-statements (messes up lots of context-based stuff and looks bad)
-    "RUF067",  # non-empty-init-module, since we need lots of logic in our __init__
+    "builtin-argument-shadowing",    # builtin-argument-shadowing
+    "any-type",  # any-type (mypy's `disallow_any_explicit` is better)
+    "module-import-not-at-top-of-file",    # module-import-not-at-top-of-file (usually OS-specific)
+    "line-too-long",    # line-too-long
+    "undefined-local-with-import-star",    # undefined-local-with-import-star
+    "undefined-local-with-import-star-usage",    # undefined-local-with-import-star-usage
+    "try-except-in-loop", # try-except-in-loop (not always possible to refactor)
+    "pytest-raises-with-multiple-statements",   # multiple statements in pytest.raises block
+    "multiple-with-statements",  # multiple-with-statements (messes up lots of context-based stuff and looks bad)
+    "non-empty-init-module",  # non-empty-init-module, since we need lots of logic in our __init__
 
     # conflicts with formatter (ruff recommends these be disabled)
-    "COM812",
+    "missing-trailing-comma",
 ]
 
 [tool.ruff.lint.per-file-ignores]
 # F401 is ignoring unused imports. For these particular files,
 # these are public APIs where we are importing everything we want
 # to export for public use.
-'src/trio/__init__.py' = ['F401']
-'src/trio/_core/__init__.py' = ['F401']
-'src/trio/abc.py' = ['F401', 'A005']
-'src/trio/lowlevel.py' = ['F401']
-'src/trio/socket.py' = ['F401', 'A005']
-'src/trio/testing/__init__.py' = ['F401']
+'src/trio/__init__.py' = ['unused-import']
+'src/trio/_core/__init__.py' = ['unused-import']
+'src/trio/abc.py' = ['unused-import', 'stdlib-module-shadowing']
+'src/trio/lowlevel.py' = ['unused-import']
+'src/trio/socket.py' = ['unused-import', 'stdlib-module-shadowing']
+'src/trio/testing/__init__.py' = ['unused-import']
 
 # RUF029 is ignoring tests that are marked as async functions but
 # do not use an await in their function bodies. There are several
@@ -179,12 +179,12 @@ extend-ignore = [
 #
 # RUF069 is ignoring exact float comparison, because we use that
 # in combination with autojump clocks
-'src/trio/_tests/*.py' = ['RUF029', 'RUF069']
-'src/trio/_core/_tests/*.py' = ['RUF029', 'RUF069']
+'src/trio/_tests/*.py' = ['unused-async', 'float-equality-comparison']
+'src/trio/_core/_tests/*.py' = ['unused-async', 'float-equality-comparison']
 # A005 is ignoring modules that shadow stdlib modules.
-'src/trio/_abc.py' = ['A005']
-'src/trio/_socket.py' = ['A005']
-'src/trio/_ssl.py' = ['A005']
+'src/trio/_abc.py' = ['stdlib-module-shadowing']
+'src/trio/_socket.py' = ['stdlib-module-shadowing']
+'src/trio/_ssl.py' = ['stdlib-module-shadowing']
 
 [tool.ruff.lint.isort]
 combine-as-imports = true

src/trio/_abc.py

@@ -66,7 +66,7 @@ def deadline_to_sleep_time(self, deadline: float) -> float:
         """
 
 
-class Instrument(ABC):  # noqa: B024  # conceptually is ABC
+class Instrument(ABC):  # ruff:ignore[abstract-base-class-without-abstract-method]  # conceptually is ABC
     """The interface for run loop instrumentation.
 
     Instruments don't have to inherit from this abstract base class, and all

src/trio/_channel.py

@@ -2,7 +2,10 @@
 
 import sys
 from collections import OrderedDict, deque
-from collections.abc import AsyncGenerator, Callable  # noqa: TC003  # Needed for Sphinx
+from collections.abc import (  # ruff:ignore[typing-only-standard-library-import]  # Needed for Sphinx
+    AsyncGenerator,
+    Callable,
+)
 from contextlib import AbstractAsyncContextManager, asynccontextmanager
 from functools import wraps
 from math import inf
@@ -100,7 +103,7 @@ class open_memory_channel(tuple["MemorySendChannel[T]", "MemoryReceiveChannel[T]
 
     def __new__(  # type: ignore[misc]  # "must return a subtype"
         cls,
-        max_buffer_size: int | float,  # noqa: PYI041
+        max_buffer_size: int | float,  # ruff:ignore[redundant-numeric-union]
     ) -> tuple[MemorySendChannel[T], MemoryReceiveChannel[T]]:
         if max_buffer_size != inf and not isinstance(max_buffer_size, int):
             raise TypeError("max_buffer_size must be an integer or math.inf")
@@ -112,7 +115,7 @@ def __new__(  # type: ignore[misc]  # "must return a subtype"
             MemoryReceiveChannel[T]._create(state),
         )
 
-    def __init__(self, max_buffer_size: int | float) -> None:  # noqa: PYI041
+    def __init__(self, max_buffer_size: int | float) -> None:  # ruff:ignore[redundant-numeric-union]
         ...
 
 
@@ -621,7 +624,7 @@ async def _move_elems_to_channel(
                     genexits_seen = 0
                     for e in removed_exceptions:
                         if isinstance(e, BaseExceptionGroup):
-                            removed_exceptions.extend(e.exceptions)  # noqa: B909
+                            removed_exceptions.extend(e.exceptions)  # ruff:ignore[loop-iterator-mutation]
                         else:
                             genexits_seen += 1
 

src/trio/_core/_entry_queue.py

@@ -65,7 +65,7 @@ def run_cb(job: Job) -> None:
                 sync_fn(*args)
             except BaseException as exc:
 
-                async def kill_everything(  # noqa: RUF029  # await not used
+                async def kill_everything(  # ruff:ignore[unused-async]  # await not used
                     exc: BaseException,
                 ) -> NoReturn:
                     raise exc

src/trio/_core/_ki.py

@@ -129,13 +129,13 @@ def remove(
             k: _IdRef[_KT],
             selfref: weakref.ref[
                 WeakKeyIdentityDictionary[_KT, _VT]
-            ] = weakref.ref(  # noqa: B008  # function-call-in-default-argument
+            ] = weakref.ref(  # ruff:ignore[function-call-in-default-argument]  # function-call-in-default-argument
                 self,
             ),
         ) -> None:
             self = selfref()
             if self is not None:
-                try:  # noqa: SIM105  # suppressible-exception
+                try:  # ruff:ignore[suppressible-exception]  # suppressible-exception
                     del self._data[k]
                 except KeyError:
                     pass

src/trio/_core/_parking_lot.py

@@ -189,7 +189,7 @@ def abort_fn(_: _core.RaiseCancelT) -> _core.Abort:
 
         await _core.wait_task_rescheduled(abort_fn)
 
-    def _pop_several(self, count: int | float) -> Iterator[Task]:  # noqa: PYI041
+    def _pop_several(self, count: int | float) -> Iterator[Task]:  # ruff:ignore[redundant-numeric-union]
         if isinstance(count, float):
             if math.isinf(count):
                 count = len(self._parked)
@@ -202,7 +202,7 @@ def _pop_several(self, count: int | float) -> Iterator[Task]:  # noqa: PYI041
             yield task
 
     @_core.enable_ki_protection
-    def unpark(self, *, count: int | float = 1) -> list[Task]:  # noqa: PYI041
+    def unpark(self, *, count: int | float = 1) -> list[Task]:  # ruff:ignore[redundant-numeric-union]
         """Unpark one or more tasks.
 
         This wakes up ``count`` tasks that are blocked in :meth:`park`. If
@@ -227,7 +227,7 @@ def repark(
         self,
         new_lot: ParkingLot,
         *,
-        count: int | float = 1,  # noqa: PYI041
+        count: int | float = 1,  # ruff:ignore[redundant-numeric-union]
     ) -> None:
         """Move parked tasks from one :class:`ParkingLot` object to another.
 

src/trio/_core/_run.py

@@ -158,7 +158,7 @@ def _count_context_run_tb_frames() -> int:
 
     def function_with_unique_name_xyzzy() -> NoReturn:
         try:
-            1 / 0  # noqa: B018  # We need a ZeroDivisionError to fire
+            1 / 0  # ruff:ignore[useless-expression]  # We need a ZeroDivisionError to fire
         except ZeroDivisionError:
             raise
         else:  # pragma: no cover
@@ -961,7 +961,7 @@ def cancel_called(self) -> bool:
         cancelled, then :attr:`cancelled_caught` is usually more
         appropriate.
         """
-        if (  # noqa: SIM102  # collapsible-if but this way is nicer
+        if (  # ruff:ignore[collapsible-if]  # collapsible-if but this way is nicer
             self._cancel_status is not None or not self._has_been_entered
         ):
             # Scope is active or not yet entered: make sure cancel_called

src/trio/_core/_tests/test_asyncgen.py

@@ -23,7 +23,7 @@ async def example(cause: str) -> AsyncGenerator[int, None]:
         try:
             with contextlib.suppress(GeneratorExit):
                 # we *want* to test what happens to delayed `await`
-                yield 42  # noqa: ASYNC119
+                yield 42  # ruff:ignore[yield-in-context-manager-in-async-generator]
             await _core.checkpoint()
         except _core.Cancelled:
             assert "exhausted" not in cause
@@ -44,7 +44,7 @@ async def example(cause: str) -> AsyncGenerator[int, None]:
 
     async def async_main() -> None:
         # GC'ed before exhausted
-        with pytest.warns(  # noqa: PT031
+        with pytest.warns(  # ruff:ignore[pytest-warns-with-multiple-statements]
             ResourceWarning,
             match="Async generator.*collected before.*exhausted",
         ):
@@ -281,12 +281,12 @@ async def well_behaved() -> AsyncGenerator[int, None]:
     # noqas because we *want* to test delayed yield/await!
     async def yields_after_yield() -> AsyncGenerator[int, None]:
         with pytest.raises(GeneratorExit):
-            yield 42  # noqa: ASYNC119
+            yield 42  # ruff:ignore[yield-in-context-manager-in-async-generator]
         yield 100
 
     async def awaits_after_yield() -> AsyncGenerator[int, None]:
         with pytest.raises(GeneratorExit):
-            yield 42  # noqa: ASYNC119
+            yield 42  # ruff:ignore[yield-in-context-manager-in-async-generator]
         await _core.cancel_shielded_checkpoint()
 
     with restore_unraisablehook():

src/trio/_core/_tests/test_guest_mode.py

@@ -437,7 +437,7 @@ async def abandoned_main(in_host: InHost) -> None:
         with pytest.raises(ZeroDivisionError):
             trivial_guest_run(abandoned_main)
 
-    with pytest.warns(  # noqa: PT031
+    with pytest.warns(  # ruff:ignore[pytest-warns-with-multiple-statements]
         RuntimeWarning,
         match="Trio guest run got abandoned",
     ):