Merge branch 'main' into fix/issue-3409

A5rocks · web-flow · commit 2b3510330082 · 2026-04-07T18:43:43.000-04:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -20,33 +20,33 @@ repos:
       - id: sort-simple-yaml
         files: .pre-commit-config.yaml
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 26.1.0
+    rev: 26.3.1
     hooks:
       - id: black
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.15.4
+    rev: v0.15.9
     hooks:
       - id: ruff-check
         types: [file]
         types_or: [python, pyi, toml]
         args: ["--show-fixes"]
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
       - id: codespell
         additional_dependencies:
           # tomli needed on 3.10. tomllib is available in stdlib on 3.11+
           - tomli
   - repo: https://github.com/adhtruong/mirrors-typos
-    rev: v1.44.0
+    rev: v1.45.0
     hooks:
       - id: typos
   - repo: https://github.com/sphinx-contrib/sphinx-lint
     rev: v1.0.2
     hooks:
       - id: sphinx-lint
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v1.22.0
+    rev: v1.23.1
     hooks:
       - id: zizmor
   - repo: local
@@ -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.10.7
+    rev: 0.11.3
     hooks:
       # Compile requirements
       - id: pip-compile
diff --git a/docs-requirements.txt b/docs-requirements.txt
@@ -2,7 +2,7 @@
 #    uv pip compile --universal --python-version=3.11 docs-requirements.in -o docs-requirements.txt
 alabaster==1.0.0
     # via sphinx
-attrs==25.4.0
+attrs==26.1.0
     # via
     #   -r docs-requirements.in
     #   outcome
@@ -16,15 +16,15 @@ cffi==2.0.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy'
     # via
     #   -r docs-requirements.in
     #   cryptography
-charset-normalizer==3.4.4
+charset-normalizer==3.4.6
     # via requests
 click==8.3.1
     # via towncrier
 colorama==0.4.6 ; sys_platform == 'win32'
     # via
     #   click
     #   sphinx
-cryptography==46.0.5
+cryptography==46.0.6
     # via pyopenssl
 docutils==0.22.4
     # via
@@ -36,7 +36,7 @@ idna==3.11
     # via
     #   -r docs-requirements.in
     #   requests
-imagesize==1.4.1
+imagesize==2.0.0
     # via sphinx
 immutables==0.21
     # via -r docs-requirements.in
@@ -53,11 +53,11 @@ packaging==26.0
     # via sphinx
 pycparser==3.0 ; (implementation_name != 'PyPy' and os_name == 'nt') or (implementation_name != 'PyPy' and platform_python_implementation != 'PyPy')
     # via cffi
-pygments==2.19.2
+pygments==2.20.0
     # via sphinx
-pyopenssl==25.3.0
+pyopenssl==26.0.0
     # via -r docs-requirements.in
-requests==2.32.5
+requests==2.33.1
     # via sphinx
 roman-numerals==4.1.0
     # via sphinx
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -86,7 +86,8 @@ Vital statistics:
    contributing.rst
    releasing.rst
    code-of-conduct.rst
-   genindex
+
+.. once https://github.com/sphinx-doc/sphinx/issues/13733 is merged, add `genindex` above
 
 ====================
  Indices and tables
diff --git a/newsfragments/3403.deprecated.rst b/newsfragments/3403.deprecated.rst
@@ -0,0 +1,6 @@
+Trying to use absolute deadlines on a `trio.CancelScope` constructed
+with a relative deadline now raises, after being deprecated since Trio
+0.27.0.
+
+To switch a cancel scope from being relative to absolute, replace the
+`trio.CancelScope` object instead of trying to mutate it.
diff --git a/src/trio/_core/_local.py b/src/trio/_core/_local.py
@@ -49,12 +49,11 @@ def get(self, default: T | type[_NoValue] = _NoValue) -> T:
             raise RuntimeError("Cannot be used outside of a run context") from None
         except KeyError:
             # contextvars consistency
-            # `type: ignore` awaiting https://github.com/python/mypy/issues/15553 to be fixed & released
             if default is not _NoValue:
-                return default  # type: ignore[return-value]
+                return default
 
             if self._default is not _NoValue:
-                return self._default  # type: ignore[return-value]
+                return self._default
 
             raise LookupError(self) from None
 
diff --git a/src/trio/_core/_run.py b/src/trio/_core/_run.py
@@ -808,13 +808,9 @@ def deadline(self) -> float:
         """
         if self._relative_deadline != inf:
             assert self._deadline == inf
-            warnings.warn(
-                DeprecationWarning(
-                    "unentered relative cancel scope does not have an absolute deadline. Use `.relative_deadline`",
-                ),
-                stacklevel=2,
+            raise RuntimeError(
+                "Unentered relative cancel scope does not have an absolute deadline."
             )
-            return current_time() + self._relative_deadline
         return self._deadline
 
     @deadline.setter
@@ -823,13 +819,9 @@ def deadline(self, new_deadline: float) -> None:
             raise ValueError("deadline must not be NaN")
         if self._relative_deadline != inf:
             assert self._deadline == inf
-            warnings.warn(
-                DeprecationWarning(
-                    "unentered relative cancel scope does not have an absolute deadline. Transforming into an absolute cancel scope. First set `.relative_deadline = math.inf` if you do want an absolute cancel scope.",
-                ),
-                stacklevel=2,
+            raise RuntimeError(
+                "Unentered relative cancel scope does not have an absolute deadline."
             )
-            self._relative_deadline = inf
         with self._might_change_registered_deadline():
             self._deadline = float(new_deadline)
 
@@ -852,7 +844,7 @@ def relative_deadline(self) -> float:
         elif self._deadline != inf:
             assert self._relative_deadline == inf
             raise RuntimeError(
-                "unentered non-relative cancel scope does not have a relative deadline",
+                "Unentered non-relative cancel scope does not have a relative deadline",
             )
         return self._relative_deadline
 
@@ -868,7 +860,7 @@ def relative_deadline(self, new_relative_deadline: float) -> None:
         elif self._deadline != inf:
             assert self._relative_deadline == inf
             raise RuntimeError(
-                "unentered non-relative cancel scope does not have a relative deadline",
+                "Unentered non-relative cancel scope does not have a relative deadline",
             )
         else:
             self._relative_deadline = new_relative_deadline
diff --git a/src/trio/_core/_tests/test_asyncgen.py b/src/trio/_core/_tests/test_asyncgen.py
@@ -306,10 +306,12 @@ def test_delegation_to_existing_hooks() -> None:
 
     def my_firstiter(agen: AsyncGenerator[object, NoReturn]) -> None:
         assert isinstance(agen, AsyncGeneratorType)
+        assert agen.ag_frame is not None
         record.append("firstiter " + agen.ag_frame.f_locals["arg"])
 
     def my_finalizer(agen: AsyncGenerator[object, NoReturn]) -> None:
         assert isinstance(agen, AsyncGeneratorType)
+        assert agen.ag_frame is not None
         record.append("finalizer " + agen.ag_frame.f_locals["arg"])
 
     async def example(arg: str) -> AsyncGenerator[int, None]:
diff --git a/src/trio/_path.py b/src/trio/_path.py
@@ -263,8 +263,9 @@ def __repr__(self) -> str:
     if sys.version_info >= (3, 13):
         full_match = _wrap_method(pathlib.Path.full_match)
 
+    # TODO: only allow this for Python <3.19.
     def as_uri(self) -> str:
-        return pathlib.Path.as_uri(self)
+        return pathlib.PurePath.as_uri(self)
 
 
 if Path.relative_to.__doc__:  # pragma: no branch
diff --git a/src/trio/_socket.py b/src/trio/_socket.py
@@ -338,7 +338,7 @@ def fromshare(info: bytes) -> SocketType:
 else:
     FamilyDefault: None = None
     FamilyT: TypeAlias = int | AddressFamily | None
-    TypeT: TypeAlias = _stdlib_socket.socket | int
+    TypeT: TypeAlias = _stdlib_socket.SocketKind | int
 
 
 @_wraps(_stdlib_socket.socketpair, assigned=(), updated=())
diff --git a/src/trio/_tests/test_exports.py b/src/trio/_tests/test_exports.py
@@ -52,6 +52,10 @@ def _ensure_mypy_cache_updated() -> None:
                 "--config-file=",
                 "--cache-dir=./.mypy_cache",
                 "--no-error-summary",
+                # TODO: update our tests to use the exposed APIs
+                # instead of reading JSON... or use dmypy?
+                "--no-fixed-format-cache",
+                "--no-sqlite-cache",
                 "-c",
                 "import trio",
             ],
diff --git a/src/trio/_tests/test_path.py b/src/trio/_tests/test_path.py
@@ -2,6 +2,7 @@
 
 import os
 import pathlib
+import sys
 from typing import TYPE_CHECKING
 
 import pytest
@@ -230,6 +231,9 @@ async def test_globmethods(path: trio.Path) -> None:
     assert entries == {"_bar.txt", "bar.txt"}
 
 
+@pytest.mark.xfail(
+    sys.version_info >= (3, 14), reason="we need to update `as_uri` to use Path.as_uri"
+)
 async def test_as_uri(path: trio.Path) -> None:
     path = await path.parent.resolve()
 
diff --git a/src/trio/_tests/test_timeouts.py b/src/trio/_tests/test_timeouts.py
@@ -33,7 +33,7 @@ async def check_takes_about(f: Callable[[], Awaitable[T]], expected_dur: float)
     result = await outcome.acapture(f)
     dur = time.perf_counter() - start
     print(dur / expected_dur)
-    # 1.5 is an arbitrary fudge factor because there's always some delay
+    # 2.0 is an arbitrary fudge factor because there's always some delay
     # between when we become eligible to wake up and when we actually do. We
     # used to sleep for 0.05, and regularly observed overruns of 1.6x on
     # Appveyor, and then started seeing overruns of 2.3x on Travis's macOS, so
@@ -52,7 +52,7 @@ async def check_takes_about(f: Callable[[], Awaitable[T]], expected_dur: float)
     # lol floating point we got slightly different rounding errors. (That
     # value above is exactly 128 ULPs below 1.0, which would make sense if it
     # started as a 1 ULP error at a different dynamic range.)
-    assert (1 - 1e-8) <= (dur / expected_dur) < 1.5
+    assert (1 - 1e-8) <= (dur / expected_dur) < 2.0
 
     return result.unwrap()
 
@@ -243,29 +243,24 @@ async def test_timeout_deadline_on_entry(mock_clock: _core.MockClock) -> None:
         assert rcs is cs
 
 
-async def test_invalid_access_unentered(mock_clock: _core.MockClock) -> None:
+async def test_invalid_access_unentered() -> None:
     cs = move_on_after(5)
-    mock_clock.jump(3)
-    start = _core.current_time()
 
-    match_str = "^unentered relative cancel scope does not have an absolute deadline"
-    with pytest.warns(DeprecationWarning, match=match_str):
-        assert cs.deadline == start + 5
-    mock_clock.jump(1)
-    # this is hella sketchy, but they *have* been warned
-    with pytest.warns(DeprecationWarning, match=match_str):
-        assert cs.deadline == start + 6
+    match_str = "^Unentered relative cancel scope does not have an absolute deadline"
+    with pytest.raises(RuntimeError, match=match_str):
+        assert cs.deadline
 
-    with pytest.warns(DeprecationWarning, match=match_str):
+    with pytest.raises(RuntimeError, match=match_str):
         cs.deadline = 7
-    # now transformed into absolute
-    assert cs.deadline == 7
-    assert not cs.is_relative
+
+    # nothing happened!
+    assert cs.relative_deadline == 5
+    assert cs.is_relative
 
     cs = move_on_at(5)
 
     match_str = (
-        "^unentered non-relative cancel scope does not have a relative deadline$"
+        "^Unentered non-relative cancel scope does not have a relative deadline$"
     )
     with pytest.raises(RuntimeError, match=match_str):
         assert cs.relative_deadline
diff --git a/src/trio/_util.py b/src/trio/_util.py
@@ -298,7 +298,8 @@ def name_asyncgen(agen: AsyncGeneratorType[object, NoReturn]) -> str:
     if not hasattr(agen, "ag_code"):  # pragma: no cover
         return repr(agen)
     try:
-        module = agen.ag_frame.f_globals["__name__"]
+        # `agen.ag_frame` can be None, but we catch AttributeError.
+        module = agen.ag_frame.f_globals["__name__"]  # type: ignore[union-attr]
     except (AttributeError, KeyError):
         module = f"<{agen.ag_code.co_filename}>"
     try:
diff --git a/test-requirements.txt b/test-requirements.txt
