Merge branch 'main' into add_tox

Author: jakkdl

.github/workflows/ci.yml

@@ -155,7 +155,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         arch: ['x86', 'x64']
         lsp: ['']
         lsp_extract_file: ['']
@@ -237,7 +237,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         check_formatting: ['0']
         no_test_requirements: ['0']
         extra_name: ['']
@@ -306,7 +306,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     continue-on-error: >-
       ${{
         (

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
           # tomli needed on 3.10. tomllib is available in stdlib on 3.11+
           - tomli
   - repo: https://github.com/crate-ci/typos
-    rev: typos-dict-v0.12.4
+    rev: typos-dict-v0.12.5
     hooks:
       - id: typos
   - repo: https://github.com/sphinx-contrib/sphinx-lint
@@ -59,7 +59,7 @@ repos:
         additional_dependencies: ["astor", "attrs", "black", "ruff"]
         files: ^src\/trio\/_core\/(_run|(_i(o_(common|epoll|kqueue|windows)|nstrumentation)))\.py$
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.5.30
+    rev: 0.6.1
     hooks:
       # Compile requirements
       - id: pip-compile

src/trio/_core/_tests/test_run.py

@@ -2817,6 +2817,10 @@ def no_other_refs() -> list[object]:
     sys.implementation.name != "cpython",
     reason="Only makes sense with refcounting GC",
 )
+@pytest.mark.xfail(
+    sys.version_info >= (3, 14),
+    reason="https://github.com/python/cpython/issues/125603",
+)
 async def test_ki_protection_doesnt_leave_cyclic_garbage() -> None:
     class MyException(Exception):
         pass

test-requirements.in

@@ -12,7 +12,7 @@ cryptography>=41.0.0  # cryptography<41 segfaults on pypy3.10
 # Tools
 black; implementation_name == "cpython"
 mypy  # Would use mypy[faster-cache], but orjson has build issues on pypy
-orjson; implementation_name == "cpython"
+orjson; implementation_name == "cpython" and python_version < "3.14"    # orjson does not yet install on 3.14
 ruff >= 0.8.0
 astor          # code generation
 uv >= 0.2.24

test-requirements.txt

@@ -92,7 +92,7 @@ nodeenv==1.9.1
     # via
     #   pre-commit
     #   pyright
-orjson==3.10.15 ; implementation_name == 'cpython'
+orjson==3.10.15 ; python_full_version < '3.14' and implementation_name == 'cpython'
     # via -r test-requirements.in
 outcome==1.3.0.post0
     # via -r test-requirements.in
@@ -186,7 +186,7 @@ typing-extensions==4.12.2
     #   pyright
 urllib3==2.3.0
     # via requests
-uv==0.5.30
+uv==0.6.1
     # via -r test-requirements.in
 virtualenv==20.29.2
     # via pre-commit