From 06e694019f700a57bcfba6d7b7262e2c340fc514 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 02:35:43 +0000 Subject: [PATCH 1/5] Dependency updates --- .pre-commit-config.yaml | 8 ++--- docs-requirements.txt | 10 +++---- src/trio/_core/_run.py | 1 - src/trio/_core/_tests/test_ki.py | 3 -- .../_tests/tools/test_sync_requirements.py | 4 --- test-requirements.txt | 30 +++++++++---------- 6 files changed, 24 insertions(+), 32 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 007964cb66..84391ca22b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -20,11 +20,11 @@ repos: - id: sort-simple-yaml files: .pre-commit-config.yaml - repo: https://github.com/psf/black-pre-commit-mirror - rev: 26.5.0 + rev: 26.5.1 hooks: - id: black - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.15.13 + rev: v0.15.15 hooks: - id: ruff-check types: [file] @@ -38,7 +38,7 @@ repos: # tomli needed on 3.10. tomllib is available in stdlib on 3.11+ - tomli - repo: https://github.com/adhtruong/mirrors-typos - rev: v1.46.2 + rev: v1.47.0 hooks: - id: typos - repo: https://github.com/sphinx-contrib/sphinx-lint @@ -73,7 +73,7 @@ repos: additional_dependencies: ["pyyaml"] files: ^(test-requirements\.txt)|(\.pre-commit-config\.yaml)$ - repo: https://github.com/astral-sh/uv-pre-commit - rev: 0.11.14 + rev: 0.11.17 hooks: # Compile requirements - id: pip-compile diff --git a/docs-requirements.txt b/docs-requirements.txt index 5964c6204c..614ba134f9 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -10,7 +10,7 @@ babel==2.18.0 # via sphinx beautifulsoup4==4.14.3 # via sphinx-codeautolink -certifi==2026.4.22 +certifi==2026.5.20 # via requests cffi==2.0.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy' # via @@ -18,7 +18,7 @@ cffi==2.0.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy' # cryptography charset-normalizer==3.4.7 # via requests -click==8.4.0 +click==8.4.1 # via towncrier colorama==0.4.6 ; sys_platform == 'win32' # via @@ -32,7 +32,7 @@ docutils==0.22.4 # sphinx-rtd-theme exceptiongroup==1.3.1 # via -r docs-requirements.in -idna==3.15 +idna==3.17 # via # -r docs-requirements.in # requests @@ -63,11 +63,11 @@ roman-numerals==4.1.0 # via sphinx sniffio==1.3.1 # via -r docs-requirements.in -snowballstemmer==3.0.1 +snowballstemmer==3.1.0 # via sphinx sortedcontainers==2.4.0 # via -r docs-requirements.in -soupsieve==2.8.3 +soupsieve==2.8.4 # via beautifulsoup4 sphinx==9.0.4 ; python_full_version < '3.12' # via diff --git a/src/trio/_core/_run.py b/src/trio/_core/_run.py index c731fe59eb..ddd4ea7ee2 100644 --- a/src/trio/_core/_run.py +++ b/src/trio/_core/_run.py @@ -75,7 +75,6 @@ # for some strange reason Sphinx works with outcome.Outcome, but not Outcome, in # start_guest_run. Same with types.FrameType in iter_await_frames - import outcome from typing_extensions import Self, TypeVar, TypeVarTuple, Unpack PosArgT = TypeVarTuple("PosArgT") diff --git a/src/trio/_core/_tests/test_ki.py b/src/trio/_core/_tests/test_ki.py index ea45edaef6..457e6c5c62 100644 --- a/src/trio/_core/_tests/test_ki.py +++ b/src/trio/_core/_tests/test_ki.py @@ -28,10 +28,7 @@ if TYPE_CHECKING: from collections.abc import ( AsyncGenerator, - AsyncIterator, - Callable, Generator, - Iterator, ) from ..._core import Abort, RaiseCancelT diff --git a/src/trio/_tests/tools/test_sync_requirements.py b/src/trio/_tests/tools/test_sync_requirements.py index b2acfdceb5..ecfb0711f0 100644 --- a/src/trio/_tests/tools/test_sync_requirements.py +++ b/src/trio/_tests/tools/test_sync_requirements.py @@ -1,7 +1,6 @@ from __future__ import annotations from pathlib import Path -from typing import TYPE_CHECKING from trio._tests.pytest_plugin import skip_if_optional_else_raise @@ -16,9 +15,6 @@ yield_pre_commit_version_data, ) -if TYPE_CHECKING: - from pathlib import Path - def test_yield_pre_commit_version_data() -> None: text = """ diff --git a/test-requirements.txt b/test-requirements.txt index 6071e0f4d0..648ee04881 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -16,9 +16,9 @@ attrs==26.1.0 # outcome babel==2.18.0 # via sphinx -black==26.5.0 ; implementation_name == 'cpython' +black==26.5.1 ; implementation_name == 'cpython' # via -r test-requirements.in -certifi==2026.4.22 +certifi==2026.5.20 # via requests cffi==2.0.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy' # via @@ -28,7 +28,7 @@ cfgv==3.5.0 # via pre-commit charset-normalizer==3.4.7 # via requests -click==8.4.0 ; implementation_name == 'cpython' +click==8.4.1 ; implementation_name == 'cpython' # via black codespell==2.4.2 # via -r test-requirements.in @@ -38,7 +38,7 @@ colorama==0.4.6 ; sys_platform == 'win32' # pylint # pytest # sphinx -coverage==7.14.0 +coverage==7.14.1 # via -r test-requirements.in cryptography==48.0.0 # via @@ -64,7 +64,7 @@ filelock==3.29.0 # virtualenv identify==2.6.19 # via pre-commit -idna==3.15 +idna==3.17 # via # -r test-requirements.in # requests @@ -109,7 +109,7 @@ pathspec==1.1.1 ; implementation_name == 'cpython' # via # black # mypy -platformdirs==4.9.6 +platformdirs==4.10.0 # via # black # pylint @@ -133,7 +133,7 @@ pyright==1.1.409 # via -r test-requirements.in pytest==9.0.3 # via -r test-requirements.in -python-discovery==1.3.1 +python-discovery==1.4.0 # via virtualenv pytokens==0.4.1 ; implementation_name == 'cpython' # via black @@ -143,11 +143,11 @@ requests==2.34.2 # via sphinx roman-numerals==4.1.0 ; python_full_version >= '3.11' # via sphinx -ruff==0.15.13 +ruff==0.15.15 # via -r test-requirements.in sniffio==1.3.1 # via -r test-requirements.in -snowballstemmer==3.0.1 +snowballstemmer==3.1.0 # via sphinx sortedcontainers==2.4.0 # via -r test-requirements.in @@ -180,17 +180,17 @@ tomlkit==0.15.0 # via pylint trustme==1.2.1 # via -r test-requirements.in -types-cffi==2.0.0.20260508 +types-cffi==2.0.0.20260518 # via # -r test-requirements.in # types-pyopenssl -types-docutils==0.22.3.20260508 +types-docutils==0.22.3.20260518 # via -r test-requirements.in types-pyopenssl==24.1.0.20240722 # via -r test-requirements.in -types-pyyaml==6.0.12.20260510 +types-pyyaml==6.0.12.20260518 # via -r test-requirements.in -types-setuptools==82.0.0.20260508 +types-setuptools==82.0.0.20260518 # via types-cffi typing-extensions==4.15.0 # via @@ -205,7 +205,7 @@ typing-extensions==4.15.0 # virtualenv urllib3==2.7.0 # via requests -uv==0.11.14 +uv==0.11.17 # via -r test-requirements.in -virtualenv==21.3.3 +virtualenv==21.4.2 # via pre-commit From 7e0a7a2e72948604f5166d2c823427b2641d2e7f Mon Sep 17 00:00:00 2001 From: A5rocks Date: Mon, 1 Jun 2026 13:50:14 +0900 Subject: [PATCH 2/5] Address CI failures noqa RUF075 since we already handle exceptions --- src/trio/_core/_tests/test_ki.py | 3 +++ src/trio/_tests/test_dtls.py | 2 +- src/trio/_tests/test_subprocess.py | 2 +- src/trio/_tests/tools/test_sync_requirements.py | 5 ++++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/trio/_core/_tests/test_ki.py b/src/trio/_core/_tests/test_ki.py index 457e6c5c62..ea45edaef6 100644 --- a/src/trio/_core/_tests/test_ki.py +++ b/src/trio/_core/_tests/test_ki.py @@ -28,7 +28,10 @@ if TYPE_CHECKING: from collections.abc import ( AsyncGenerator, + AsyncIterator, + Callable, Generator, + Iterator, ) from ..._core import Abort, RaiseCancelT diff --git a/src/trio/_tests/test_dtls.py b/src/trio/_tests/test_dtls.py index fd51dbc679..99cb68f11f 100644 --- a/src/trio/_tests/test_dtls.py +++ b/src/trio/_tests/test_dtls.py @@ -98,7 +98,7 @@ async def echo_handler(dtls_channel: DTLSChannel) -> None: await nursery.start(server.serve, server_ctx, echo_handler) - yield server, server.socket.getsockname() + yield server, server.socket.getsockname() # noqa: RUF075 if autocancel: nursery.cancel_scope.cancel() diff --git a/src/trio/_tests/test_subprocess.py b/src/trio/_tests/test_subprocess.py index a1a70e575d..890dd0d4e9 100644 --- a/src/trio/_tests/test_subprocess.py +++ b/src/trio/_tests/test_subprocess.py @@ -103,7 +103,7 @@ async def run_process_in_nursery( # type: ignore[misc, explicit-any] value = await nursery.start(partial(run_process, *args, **kwargs)) assert isinstance(value, Process) proc: Process = value - yield proc + yield proc # noqa: RUF075 nursery.cancel_scope.cancel() diff --git a/src/trio/_tests/tools/test_sync_requirements.py b/src/trio/_tests/tools/test_sync_requirements.py index ecfb0711f0..92b3bfdd97 100644 --- a/src/trio/_tests/tools/test_sync_requirements.py +++ b/src/trio/_tests/tools/test_sync_requirements.py @@ -1,6 +1,6 @@ from __future__ import annotations -from pathlib import Path +from typing import TYPE_CHECKING from trio._tests.pytest_plugin import skip_if_optional_else_raise @@ -15,6 +15,9 @@ yield_pre_commit_version_data, ) +if TYPE_CHECKING: + from pathlib import Path + def test_yield_pre_commit_version_data() -> None: text = """ From f373411924ddbd5c8568a2b6b889860e45696e0b Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 04:50:30 +0000 Subject: [PATCH 3/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/trio/_core/_tests/test_ki.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/trio/_core/_tests/test_ki.py b/src/trio/_core/_tests/test_ki.py index ea45edaef6..457e6c5c62 100644 --- a/src/trio/_core/_tests/test_ki.py +++ b/src/trio/_core/_tests/test_ki.py @@ -28,10 +28,7 @@ if TYPE_CHECKING: from collections.abc import ( AsyncGenerator, - AsyncIterator, - Callable, Generator, - Iterator, ) from ..._core import Abort, RaiseCancelT From 333aee17ec0fee5e3cdf3154fc121b3d7077f3ac Mon Sep 17 00:00:00 2001 From: A5rocks Date: Mon, 1 Jun 2026 13:51:46 +0900 Subject: [PATCH 4/5] Actually remove the import, oops --- src/trio/_core/_tests/test_ki.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/trio/_core/_tests/test_ki.py b/src/trio/_core/_tests/test_ki.py index 457e6c5c62..b8af07eb2f 100644 --- a/src/trio/_core/_tests/test_ki.py +++ b/src/trio/_core/_tests/test_ki.py @@ -6,7 +6,6 @@ import sys import threading import weakref -from collections.abc import AsyncIterator, Callable, Iterator from typing import TYPE_CHECKING, TypeVar import outcome From bdca00963513638e763a781557ea9aff37aedc96 Mon Sep 17 00:00:00 2001 From: A5rocks Date: Mon, 1 Jun 2026 13:55:13 +0900 Subject: [PATCH 5/5] :/ --- src/trio/_core/_tests/test_ki.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/trio/_core/_tests/test_ki.py b/src/trio/_core/_tests/test_ki.py index b8af07eb2f..8d09233d63 100644 --- a/src/trio/_core/_tests/test_ki.py +++ b/src/trio/_core/_tests/test_ki.py @@ -27,7 +27,10 @@ if TYPE_CHECKING: from collections.abc import ( AsyncGenerator, + AsyncIterator, + Callable, Generator, + Iterator, ) from ..._core import Abort, RaiseCancelT