add test run for 3.13t

Author: davidhewitt

.github/workflows/ci.yml

@@ -68,6 +68,7 @@ jobs:
           - '3.11'
           - '3.12'
           - '3.13'
+          - '3.13t'
           - 'pypy3.9'
           - 'pypy3.10'
 
@@ -96,11 +97,15 @@ jobs:
         env:
           RUST_BACKTRACE: 1
 
+      - if: endsWith(matrix.python-version, 't')
+        run: uv pip install pytest-run-parallel
+
       - run: uv pip freeze
 
       - run: uv run pytest
         env:
           HYPOTHESIS_PROFILE: slow
+          PYTEST_ADDOPTS: ${{ endsWith(matrix.python-version, 't') && '--parallel-threads=2' || '' }}
 
   test-os:
     name: test on ${{ matrix.os }}

pyproject.toml

@@ -107,6 +107,9 @@ filterwarnings = [
     # Python 3.9 and below allowed truncation of float to integers in some
     # cases, by not making this an error we can test for this behaviour
     'ignore:(.+)Implicit conversion to integers using __int__ is deprecated',
+    # free-threading seems to upset Hypothesis
+    'ignore:The recursion limit will not be reset, since it was changed from another thread or during execution of a test.',
+    'ignore:Do not use the `random` module inside strategies; instead consider  `st.randoms()`, `st.sampled_from()`, etc.  from data=datetimes()',
 ]
 timeout = 30
 xfail_strict = true

src/argument_markers.rs

@@ -5,7 +5,11 @@ use pyo3::types::{PyDict, PyTuple};
 
 use crate::tools::safe_repr;
 
-#[pyclass(module = "pydantic_core._pydantic_core", get_all, frozen, freelist = 100)]
+#[cfg_attr(
+    not(Py_GIL_DISABLED),
+    pyclass(module = "pydantic_core._pydantic_core", get_all, frozen, freelist = 100)
+)]
+#[cfg_attr(Py_GIL_DISABLED, pyclass(module = "pydantic_core._pydantic_core", get_all, frozen))]
 #[derive(Debug, Clone)]
 pub struct ArgsKwargs {
     pub(crate) args: Py<PyTuple>,

src/lib.rs

@@ -106,7 +106,7 @@ pub fn build_info() -> String {
     )
 }
 
-#[pymodule]
+#[pymodule(gil_used = false)]
 fn _pydantic_core(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add("__version__", get_pydantic_core_version())?;
     m.add("build_profile", env!("PROFILE"))?;

tests/conftest.py

@@ -1,13 +1,15 @@
 from __future__ import annotations as _annotations
 
 import functools
+import gc
 import importlib.util
 import json
 import os
 import re
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Literal
+from time import sleep, time
+from typing import Any, Callable, Literal
 
 import hypothesis
 import pytest
@@ -160,3 +162,20 @@ def infinite_generator():
     while True:
         yield i
         i += 1
+
+
+def assert_gc(test: Callable[[], bool], timeout: float = 10) -> None:
+    """Helper to retry garbage collection until the test passes or timeout is
+    reached.
+
+    This is useful on free-threading where the GC collect call finishes before
+    all cleanup is done.
+    """
+    start = now = time()
+    while now - start < timeout:
+        if test():
+            return
+        gc.collect()
+        sleep(0.1)
+        now = time()
+    raise AssertionError('Timeout waiting for GC')

tests/test_garbage_collection.py

@@ -1,4 +1,3 @@
-import gc
 import platform
 from collections.abc import Iterable
 from typing import Any
@@ -8,6 +7,8 @@
 
 from pydantic_core import SchemaSerializer, SchemaValidator, core_schema
 
+from .conftest import assert_gc
+
 GC_TEST_SCHEMA_INNER = core_schema.definitions_schema(
     core_schema.definition_reference_schema(schema_ref='model'),
     [
@@ -43,11 +44,7 @@ class MyModel(BaseModel):
 
         del MyModel
 
-    gc.collect(0)
-    gc.collect(1)
-    gc.collect(2)
-
-    assert len(cache) == 0
+    assert_gc(lambda: len(cache) == 0)
 
 
 @pytest.mark.xfail(
@@ -75,11 +72,7 @@ class MyModel(BaseModel):
 
         del MyModel
 
-    gc.collect(0)
-    gc.collect(1)
-    gc.collect(2)
-
-    assert len(cache) == 0
+    assert_gc(lambda: len(cache) == 0)
 
 
 @pytest.mark.xfail(
@@ -114,8 +107,4 @@ def __next__(self):
         v.validate_python({'iter': iterable})
         del iterable
 
-    gc.collect(0)
-    gc.collect(1)
-    gc.collect(2)
-
-    assert len(cache) == 0
+    assert_gc(lambda: len(cache) == 0)

tests/validators/test_dataclasses.py

@@ -1,5 +1,4 @@
 import dataclasses
-import gc
 import platform
 import re
 import sys
@@ -11,7 +10,7 @@
 
 from pydantic_core import ArgsKwargs, SchemaValidator, ValidationError, core_schema
 
-from ..conftest import Err, PyAndJson
+from ..conftest import Err, PyAndJson, assert_gc
 
 
 @pytest.mark.parametrize(
@@ -1586,12 +1585,8 @@ def _wrap_validator(cls, v, validator, info):
     assert ref() is not None
 
     del klass
-    gc.collect(0)
-    gc.collect(1)
-    gc.collect(2)
-    gc.collect()
 
-    assert ref() is None
+    assert_gc(lambda: ref() is None)
 
 
 init_test_cases = [

tests/validators/test_frozenset.py

@@ -82,6 +82,7 @@ def test_frozenset_no_validators_both(py_and_json: PyAndJson, input_value, expec
         ('abc', Err('Input should be a valid frozenset')),
     ],
 )
+@pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_frozenset_ints_python(input_value, expected):
     v = SchemaValidator({'type': 'frozenset', 'items_schema': {'type': 'int'}})
     if isinstance(expected, Err):
@@ -165,6 +166,7 @@ def generate_repeats():
         ),
     ],
 )
+@pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_frozenset_kwargs_python(kwargs: dict[str, Any], input_value, expected):
     v = SchemaValidator({'type': 'frozenset', **kwargs})
     if isinstance(expected, Err):

tests/validators/test_list.py

@@ -71,6 +71,7 @@ def gen_ints():
     ],
     ids=repr,
 )
+@pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_list_int(input_value, expected):
     v = SchemaValidator({'type': 'list', 'items_schema': {'type': 'int'}})
     if isinstance(expected, Err):
@@ -170,6 +171,7 @@ def test_list_error(input_value, index):
         ),
     ],
 )
+@pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_list_length_constraints(kwargs: dict[str, Any], input_value, expected):
     v = SchemaValidator({'type': 'list', **kwargs})
     if isinstance(expected, Err):
@@ -511,6 +513,7 @@ class ListInputTestCase:
     ],
     ids=repr,
 )
+@pytest.mark.thread_unsafe  # generators in parameters not compatible with pytest-run-parallel, https://github.com/Quansight-Labs/pytest-run-parallel/issues/14
 def test_list_allowed_inputs_python(testcase: ListInputTestCase):
     v = SchemaValidator(core_schema.list_schema(core_schema.int_schema(), strict=testcase.strict))
     if isinstance(testcase.output, Err):

tests/validators/test_model_init.py

@@ -1,4 +1,3 @@
-import gc
 import platform
 import weakref
 
@@ -7,6 +6,8 @@
 
 from pydantic_core import CoreConfig, SchemaValidator, core_schema
 
+from ..conftest import assert_gc
+
 
 class MyModel:
     # this is not required, but it avoids `__pydantic_fields_set__` being included in `__dict__`
@@ -473,12 +474,8 @@ def _wrap_validator(cls, v, validator, info):
     assert ref() is not None
 
     del klass
-    gc.collect(0)
-    gc.collect(1)
-    gc.collect(2)
-    gc.collect()
 
-    assert ref() is None
+    assert_gc(lambda: ref() is None)
 
 
 def test_model_custom_init_with_union() -> None: