Skip to content

Commit d63f3a9

Browse files
authored
Merge pull request #3211 from musicinmybrain/issue-3209
Add xfail for issue 3209, and start testing Python 3.14
2 parents 5eb5afb + 6b63492 commit d63f3a9

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
strategy:
156156
fail-fast: false
157157
matrix:
158-
python: ['3.9', '3.10', '3.11', '3.12', '3.13']
158+
python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
159159
arch: ['x86', 'x64']
160160
lsp: ['']
161161
lsp_extract_file: ['']
@@ -237,7 +237,7 @@ jobs:
237237
strategy:
238238
fail-fast: false
239239
matrix:
240-
python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
240+
python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
241241
check_formatting: ['0']
242242
no_test_requirements: ['0']
243243
extra_name: ['']
@@ -301,7 +301,7 @@ jobs:
301301
strategy:
302302
fail-fast: false
303303
matrix:
304-
python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13']
304+
python: ['pypy-3.10', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
305305
continue-on-error: >-
306306
${{
307307
(

src/trio/_core/_tests/test_run.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2817,6 +2817,10 @@ def no_other_refs() -> list[object]:
28172817
sys.implementation.name != "cpython",
28182818
reason="Only makes sense with refcounting GC",
28192819
)
2820+
@pytest.mark.xfail(
2821+
sys.version_info >= (3, 14),
2822+
reason="https://github.com/python/cpython/issues/125603",
2823+
)
28202824
async def test_ki_protection_doesnt_leave_cyclic_garbage() -> None:
28212825
class MyException(Exception):
28222826
pass

test-requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ cryptography>=41.0.0 # cryptography<41 segfaults on pypy3.10
1212
# Tools
1313
black; implementation_name == "cpython"
1414
mypy # Would use mypy[faster-cache], but orjson has build issues on pypy
15-
orjson; implementation_name == "cpython"
15+
orjson; implementation_name == "cpython" and python_version < "3.14" # orjson does not yet install on 3.14
1616
ruff >= 0.8.0
1717
astor # code generation
1818
uv >= 0.2.24

test-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ nodeenv==1.9.1
9292
# via
9393
# pre-commit
9494
# pyright
95-
orjson==3.10.15 ; implementation_name == 'cpython'
95+
orjson==3.10.15 ; python_full_version < '3.14' and implementation_name == 'cpython'
9696
# via -r test-requirements.in
9797
outcome==1.3.0.post0
9898
# via -r test-requirements.in

0 commit comments

Comments
 (0)