Bump dependencies from commit 80eec9 (#3025)

github-actions[bot] · TeamSpen210 · pre-commit-ci[bot] · web-flow · commit 5da94bf55db2 · 2024-07-03T00:45:33.000-05:00
* Dependency updates

* Remove now-unnecessary ruff parameter

* Adjust ruff ignores to new error codes

* Simplify some comparisons

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

* Fixing remaning new ruff issues

* Use cffi 1.17.0rc1 so 3.13 runner doesn't crash

---------

Co-authored-by: github-actions[bot] &lt;41898282+github-actions[bot]@users.noreply.github.com&gt;
Co-authored-by: Spencer Brown &lt;spencerb21@live.com&gt;
Co-authored-by: pre-commit-ci[bot] &lt;66853113+pre-commit-ci[bot]@users.noreply.github.com&gt;
Co-authored-by: CoolCat467 &lt;52022020+CoolCat467@users.noreply.github.com&gt;
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.10
+    rev: v0.5.0
     hooks:
       - id: ruff
         types: [file]
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -14,15 +14,15 @@ babel==2.15.0
     # via sphinx
 beautifulsoup4==4.12.3
     # via sphinx-codeautolink
-certifi==2024.2.2
+certifi==2024.6.2
     # via requests
 cffi==1.16.0
     # via cryptography
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
     # via towncrier
-cryptography==42.0.7
+cryptography==42.0.8
     # via pyopenssl
 docutils==0.20.1
     # via
@@ -38,7 +38,7 @@ imagesize==1.4.1
     # via sphinx
 immutables==0.20
     # via -r docs-requirements.in
-importlib-metadata==7.1.0
+importlib-metadata==8.0.0
     # via sphinx
 importlib-resources==6.4.0
     # via towncrier
@@ -53,7 +53,7 @@ markupsafe==2.1.5
     # via jinja2
 outcome==1.3.0.post0
     # via -r docs-requirements.in
-packaging==24.0
+packaging==24.1
     # via sphinx
 pycparser==2.22
     # via cffi
@@ -81,7 +81,7 @@ sphinx==7.1.2
     #   sphinx-rtd-theme
     #   sphinxcontrib-jquery
     #   sphinxcontrib-trio
-sphinx-codeautolink==0.15.1
+sphinx-codeautolink==0.15.2
     # via -r docs-requirements.in
 sphinx-hoverxref==1.4.0
     # via -r docs-requirements.in
@@ -110,9 +110,9 @@ tomli==2.0.1
     # via towncrier
 towncrier==23.11.0
     # via -r docs-requirements.in
-urllib3==2.2.1
+urllib3==2.2.2
     # via requests
-zipp==3.19.1
+zipp==3.19.2
     # via
     #   importlib-metadata
     #   importlib-resources
diff --git a/notes-to-self/blocking-read-hack.py b/notes-to-self/blocking-read-hack.py
@@ -11,7 +11,9 @@ class BlockingReadTimeoutError(Exception):
     pass
 
 
-async def blocking_read_with_timeout(fd, count, timeout):
+async def blocking_read_with_timeout(
+    fd, count, timeout  # noqa: ASYNC109  # manual timeout
+):
     print("reading from fd", fd)
     cancel_requested = False
 
diff --git a/notes-to-self/loopy.py b/notes-to-self/loopy.py
@@ -6,10 +6,9 @@
 async def loopy():
     try:
         while True:
-            time.sleep(  # noqa: ASYNC101  # synchronous sleep to avoid maxing out CPU
-                0.01
-            )
-            await trio.sleep(0)
+            # synchronous sleep to avoid maxing out CPU
+            time.sleep(0.01)  # noqa: ASYNC251
+            await trio.lowlevel.checkpoint()
     except KeyboardInterrupt:
         print("KI!")
 
diff --git a/notes-to-self/schedule-timing.py b/notes-to-self/schedule-timing.py
@@ -11,7 +11,7 @@ async def reschedule_loop(depth):
         global LOOPS
         while RUNNING:
             LOOPS += 1
-            await trio.sleep(0)
+            await trio.lowlevel.checkpoint()
             # await trio.lowlevel.cancel_shielded_checkpoint()
     else:
         await reschedule_loop(depth - 1)
diff --git a/src/trio/_core/_tests/test_guest_mode.py b/src/trio/_core/_tests/test_guest_mode.py
@@ -111,7 +111,7 @@ def done_callback(outcome: Outcome[T]) -> None:
 
 def test_guest_trivial() -> None:
     async def trio_return(in_host: InHost) -> str:
-        await trio.sleep(0)
+        await trio.lowlevel.checkpoint()
         return "ok"
 
     assert trivial_guest_run(trio_return) == "ok"
@@ -149,7 +149,7 @@ def test_guest_is_initialized_when_start_returns() -> None:
 
     async def trio_main(in_host: InHost) -> str:
         record.append("main task ran")
-        await trio.sleep(0)
+        await trio.lowlevel.checkpoint()
         assert trio.lowlevel.current_trio_token() is trio_token
         return "ok"
 
@@ -164,7 +164,7 @@ def after_start() -> None:
         @trio.lowlevel.spawn_system_task
         async def early_task() -> None:
             record.append("system task ran")
-            await trio.sleep(0)
+            await trio.lowlevel.checkpoint()
 
     res = trivial_guest_run(trio_main, in_host_after_start=after_start)
     assert res == "ok"
@@ -396,7 +396,7 @@ def do_abandoned_guest_run() -> None:
         async def abandoned_main(in_host: InHost) -> None:
             in_host(lambda: 1 / 0)
             while True:
-                await trio.sleep(0)
+                await trio.lowlevel.checkpoint()
 
         with pytest.raises(ZeroDivisionError):
             trivial_guest_run(abandoned_main)
@@ -472,7 +472,7 @@ async def trio_main() -> str:
 
         # Make sure we have at least one tick where we don't need to go into
         # the thread
-        await trio.sleep(0)
+        await trio.lowlevel.checkpoint()
 
         from_trio.put_nowait(0)
 
@@ -540,7 +540,7 @@ async def crash_in_run_loop(in_host: InHost) -> None:
 
         async def crash_in_io(in_host: InHost) -> None:
             m.setattr("trio._core._run.TheIOManager.get_events", None)
-            await trio.sleep(0)
+            await trio.lowlevel.checkpoint()
 
         with pytest.raises(trio.TrioInternalError):
             trivial_guest_run(crash_in_io)
diff --git a/src/trio/_core/_tests/test_run.py b/src/trio/_core/_tests/test_run.py
@@ -259,7 +259,7 @@ async def test_current_time() -> None:
     t1 = _core.current_time()
     # Windows clock is pretty low-resolution -- appveyor tests fail unless we
     # sleep for a bit here.
-    time.sleep(time.get_clock_info("perf_counter").resolution)  # noqa: ASYNC101
+    time.sleep(time.get_clock_info("perf_counter").resolution)  # noqa: ASYNC251
     t2 = _core.current_time()
     assert t1 < t2
 
diff --git a/src/trio/_core/_tests/test_windows.py b/src/trio/_core/_tests/test_windows.py
@@ -116,7 +116,7 @@ async def test_readinto_overlapped() -> None:
 
     with tempfile.TemporaryDirectory() as tdir:
         tfile = os.path.join(tdir, "numbers.txt")
-        with open(  # noqa: ASYNC101  # This is a test, synchronous is ok
+        with open(  # noqa: ASYNC230  # This is a test, synchronous is ok
             tfile, "wb"
         ) as fp:
             fp.write(data)
@@ -224,7 +224,7 @@ async def test_too_late_to_cancel() -> None:
             # Note: not trio.sleep! We're making sure the OS level
             # ReadFile completes, before Trio has a chance to execute
             # another checkpoint and notice it completed.
-            time.sleep(1)  # noqa: ASYNC101
+            time.sleep(1)  # noqa: ASYNC251
             nursery.cancel_scope.cancel()
         assert target[:6] == b"test1\n"
 
diff --git a/src/trio/_tests/test_exports.py b/src/trio/_tests/test_exports.py
@@ -346,7 +346,7 @@ def lookup_symbol(symbol: str) -> dict[str, str]:
             "__deepcopy__",
         }
 
-        if type(class_) == type:
+        if type(class_) is type:
             # C extension classes don't have these dunders, but Python classes do
             ignore_names.add("__firstlineno__")
             ignore_names.add("__static_attributes__")
diff --git a/src/trio/_tests/test_file_io.py b/src/trio/_tests/test_file_io.py
@@ -251,7 +251,7 @@ async def test_detach_rewraps_asynciobase(tmp_path: pathlib.Path) -> None:
     tmp_file = tmp_path / "filename"
     tmp_file.touch()
     # flake8-async does not like opening files in async mode
-    with open(tmp_file, mode="rb", buffering=0) as raw:  # noqa: ASYNC101
+    with open(tmp_file, mode="rb", buffering=0) as raw:  # noqa: ASYNC230
         buffered = io.BufferedReader(raw)
 
         async_file = trio.wrap_file(buffered)
diff --git a/src/trio/_tests/test_scheduler_determinism.py b/src/trio/_tests/test_scheduler_determinism.py
@@ -15,7 +15,7 @@ async def scheduler_trace() -> tuple[tuple[str, int], ...]:
     async def tracer(name: str) -> None:
         for i in range(50):
             trace.append((name, i))
-            await trio.sleep(0)
+            await trio.lowlevel.checkpoint()
 
     async with trio.open_nursery() as nursery:
         for i in range(5):
diff --git a/src/trio/_tests/test_threads.py b/src/trio/_tests/test_threads.py
@@ -166,8 +166,8 @@ def external_thread_fn() -> None:
         thread = threading.Thread(target=external_thread_fn)
         thread.start()
         print("waiting")
-        while thread.is_alive():
-            await sleep(0.01)
+        while thread.is_alive():  # noqa: ASYNC110
+            await sleep(0.01)  # Fine to poll in tests.
         print("waited, joining")
         thread.join()
         print("done")
@@ -376,7 +376,7 @@ async def child(q: stdlib_queue.Queue[None], abandon_on_cancel: bool) -> None:
     # Put the thread out of its misery:
     q.put(None)
     while register[0] != "finished":
-        time.sleep(0.01)  # noqa: ASYNC101  # Need to wait for OS thread
+        time.sleep(0.01)  # noqa: ASYNC251  # Need to wait for OS thread
 
     # This one can't be cancelled
     record = []
@@ -536,7 +536,9 @@ async def run_thread(event: Event) -> None:
             # sure no-one is sneaking past, and to make sure the high_water
             # check below won't fail due to scheduling issues. (It could still
             # fail if too many threads are let through here.)
-            while state.parked != MAX or c.statistics().tasks_waiting != MAX:
+            while (  # noqa: ASYNC110
+                state.parked != MAX or c.statistics().tasks_waiting != MAX
+            ):
                 await sleep(0.01)  # pragma: no cover
             # Then release the threads
             gate.set()
@@ -547,7 +549,7 @@ async def run_thread(event: Event) -> None:
             # Some threads might still be running; need to wait to them to
             # finish before checking that all threads ran. We can do this
             # using the CapacityLimiter.
-            while c.borrowed_tokens > 0:
+            while c.borrowed_tokens > 0:  # noqa: ASYNC110
                 await sleep(0.01)  # pragma: no cover
 
         assert state.ran == COUNT
diff --git a/src/trio/_tools/gen_exports.py b/src/trio/_tools/gen_exports.py
@@ -58,9 +58,7 @@ def is_function(node: ast.AST) -> TypeGuard[ast.FunctionDef | ast.AsyncFunctionD
     """Check if the AST node is either a function
     or an async function
     """
-    if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)):
-        return True
-    return False
+    return isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef))
 
 
 def is_public(node: ast.AST) -> TypeGuard[ast.FunctionDef | ast.AsyncFunctionDef]:
@@ -158,7 +156,6 @@ def run_ruff(file: File, source: str) -> tuple[bool, str]:
             "check",
             "--fix",
             "--unsafe-fixes",
-            "--output-format=text",
             "--stdin-filename",
             file.path,
             "-",
diff --git a/src/trio/_util.py b/src/trio/_util.py
@@ -127,9 +127,7 @@ def _return_value_looks_like_wrong_library(value: object) -> bool:
         # This janky check catches tornado Futures and twisted Deferreds.
         # By the time we're calling this function, we already know
         # something has gone wrong, so a heuristic is pretty safe.
-        if value.__class__.__name__ in ("Future", "Deferred"):
-            return True
-        return False
+        return value.__class__.__name__ in ("Future", "Deferred")
 
     # Make sure a sync-fn-that-returns-coroutine still sees itself as being
     # in trio context
diff --git a/src/trio/testing/_raises_group.py b/src/trio/testing/_raises_group.py
@@ -233,9 +233,7 @@ def matches(self, exception: BaseException) -> TypeGuard[MatchE]:
             return False
         # If exception_type is None check() accepts BaseException.
         # If non-none, we have done an isinstance check above.
-        if self.check is not None and not self.check(cast(MatchE, exception)):
-            return False
-        return True
+        return self.check is None or self.check(cast(MatchE, exception))
 
     def __str__(self) -> str:
         reqs = []
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -22,7 +22,7 @@ black==24.4.2 ; implementation_name == "cpython"
     # via -r test-requirements.in
 build==1.2.1
     # via pip-tools
-certifi==2024.2.2
+certifi==2024.6.2
     # via requests
 cffi==1.17.0rc1
     # via cryptography
@@ -34,9 +34,9 @@ click==8.1.7
     #   pip-tools
 codespell==2.3.0
     # via -r test-requirements.in
-coverage==7.5.3
+coverage==7.5.4
     # via -r test-requirements.in
-cryptography==42.0.7
+cryptography==42.0.8
     # via
     #   -r test-requirements.in
     #   pyopenssl
@@ -57,7 +57,7 @@ idna==3.7
     #   trustme
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.1.0
+importlib-metadata==8.0.0
     # via
     #   build
     #   sphinx
@@ -73,18 +73,18 @@ markupsafe==2.1.5
     # via jinja2
 mccabe==0.7.0
     # via pylint
-mypy==1.10.0 ; implementation_name == "cpython"
+mypy==1.10.1 ; implementation_name == "cpython"
     # via -r test-requirements.in
 mypy-extensions==1.0.0 ; implementation_name == "cpython"
     # via
     #   -r test-requirements.in
     #   black
     #   mypy
-nodeenv==1.9.0
+nodeenv==1.9.1
     # via pyright
 outcome==1.3.0.post0
     # via -r test-requirements.in
-packaging==24.0
+packaging==24.1
     # via
     #   black
     #   build
@@ -106,23 +106,23 @@ pycparser==2.22
     # via cffi
 pygments==2.18.0
     # via sphinx
-pylint==3.2.2
+pylint==3.2.5
     # via -r test-requirements.in
 pyopenssl==24.1.0
     # via -r test-requirements.in
 pyproject-hooks==1.1.0
     # via
     #   build
     #   pip-tools
-pyright==1.1.365
+pyright==1.1.369
     # via -r test-requirements.in
-pytest==8.2.1
+pytest==8.2.2
     # via -r test-requirements.in
 pytz==2024.1
     # via babel
 requests==2.32.3
     # via sphinx
-ruff==0.4.7
+ruff==0.5.0
     # via -r test-requirements.in
 sniffio==1.3.1
     # via -r test-requirements.in
@@ -164,20 +164,20 @@ types-docutils==0.21.0.20240423
     # via -r test-requirements.in
 types-pyopenssl==24.1.0.20240425 ; implementation_name == "cpython"
     # via -r test-requirements.in
-types-setuptools==70.0.0.20240524
+types-setuptools==70.1.0.20240627
     # via types-cffi
-typing-extensions==4.12.0
+typing-extensions==4.12.2
     # via
     #   -r test-requirements.in
     #   astroid
     #   black
     #   mypy
     #   pylint
-urllib3==2.2.1
+urllib3==2.2.2
     # via requests
 wheel==0.43.0
     # via pip-tools
-zipp==3.19.1
+zipp==3.19.2
     # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,7 @@ def lookup_symbol(symbol: str) -> dict[str, str]:`
`346`	`346`	`"__deepcopy__",`
`347`	`347`	`}`
`348`	`348`
`349`		`- if type(class_) == type:`
	`349`	`+ if type(class_) is type:`
`350`	`350`	`# C extension classes don't have these dunders, but Python classes do`
`351`	`351`	`ignore_names.add("__firstlineno__")`
`352`	`352`	`ignore_names.add("__static_attributes__")`