Add support for Python 3.14

Author: Viicos

.github/workflows/ci.yml

@@ -55,8 +55,6 @@ jobs:
         with:
           files: codecov.json
 
-  # See https://github.com/PyO3/pyo3/discussions/2781
-  # tests intermittently segfault with pypy and cpython 3.7 when using `coverage run ...`, hence separate job
   test-python:
     name: test ${{ matrix.python-version }}
     strategy:
@@ -69,6 +67,8 @@ jobs:
           - '3.12'
           - '3.13'
           - '3.13t'
+          - '3.14'
+          - '3.14t'
           - 'pypy3.9'
           - 'pypy3.10'
 
@@ -410,15 +410,15 @@ jobs:
           - os: linux
             manylinux: auto
             target: armv7
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.9 3.10 3.11 3.12 3.13 3.14
           - os: linux
             manylinux: auto
             target: ppc64le
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.9 3.10 3.11 3.12 3.13 3.14
           - os: linux
             manylinux: auto
             target: s390x
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.9 3.10 3.11 3.12 3.13 3.14
           - os: linux
             manylinux: auto
             target: x86_64
@@ -454,10 +454,10 @@ jobs:
           - os: windows
             target: i686
             python-architecture: x86
-            interpreter: 3.9 3.10 3.11 3.12 3.13
+            interpreter: 3.9 3.10 3.11 3.12 3.13 3.14
           - os: windows
             target: aarch64
-            interpreter: 3.11 3.12 3.13
+            interpreter: 3.11 3.12 3.13 3.14
 
         exclude:
           # See above; disabled for now.
@@ -484,7 +484,7 @@ jobs:
         with:
           target: ${{ matrix.target }}
           manylinux: ${{ matrix.manylinux }}
-          args: --release --out dist --interpreter ${{ matrix.interpreter || '3.9 3.10 3.11 3.12 3.13 pypy3.9 pypy3.10 pypy3.11' }}
+          args: --release --out dist --interpreter ${{ matrix.interpreter || '3.9 3.10 3.11 3.12 3.13 3.14 pypy3.9 pypy3.10 pypy3.11' }}
           rust-toolchain: stable
           docker-options: -e CI
 
@@ -505,7 +505,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [linux, windows, macos]
-        interpreter: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.13t']
+        interpreter: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.13t', '3.14', '3.14t']
         include:
           # standard runners with override for macos arm
           - os: linux

Cargo.lock

@@ -29,7 +29,7 @@ rust-version = "1.75"
 [dependencies]
 # TODO it would be very nice to remove the "py-clone" feature as it can panic,
 # but needs a bit of work to make sure it's not used in the codebase
-pyo3 = { version = "0.24", features = ["generate-import-lib", "num-bigint", "py-clone"] }
+pyo3 = { version = "0.25", features = ["generate-import-lib", "num-bigint", "py-clone"] }
 regex = "1.11.1"
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
@@ -46,7 +46,7 @@ base64 = "0.22.1"
 num-bigint = "0.4.6"
 num-traits = "0.2.19"
 uuid = "1.16.0"
-jiter = { version = "0.9.0", features = ["python"] }
+jiter = { version = "0.10.0", features = ["python"] }
 hex = "0.4.3"
 
 [lib]
@@ -74,12 +74,12 @@ debug = true
 strip = false
 
 [dev-dependencies]
-pyo3 = { version = "0.24", features = ["auto-initialize"] }
+pyo3 = { version = "0.25", features = ["auto-initialize"] }
 
 [build-dependencies]
 version_check = "0.9.5"
 # used where logic has to be version/distribution specific, e.g. pypy
-pyo3-build-config = { version = "0.24" }
+pyo3-build-config = { version = "0.25" }
 
 [lints.clippy]
 dbg_macro = "warn"

Cargo.toml

@@ -24,6 +24,7 @@ classifiers = [
     'Programming Language :: Python :: 3.11',
     'Programming Language :: Python :: 3.12',
     'Programming Language :: Python :: 3.13',
+    'Programming Language :: Python :: 3.14',
     'Programming Language :: Rust',
     'Framework :: Pydantic',
     'Intended Audience :: Developers',
@@ -71,7 +72,7 @@ linting = [{ include-group = "dev" }, 'griffe', 'pyright', 'ruff', 'mypy']
 wasm = [{ include-group = "dev" }, 'typing_extensions', 'ruff']
 codspeed = [
     # codspeed is only run on CI, with latest version of CPython
-    'pytest-codspeed; python_version == "3.13" and implementation_name == "cpython"',
+    'pytest-codspeed; python_version == "3.14" and implementation_name == "cpython"',
 ]
 
 all = [

pyproject.toml

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use ahash::AHashMap;
 use enum_dispatch::enum_dispatch;
-use pyo3::{AsPyPointer, Py, PyTraverseError, PyVisit};
+use pyo3::{Py, PyTraverseError, PyVisit};
 
 /// Trait implemented by types which can be traversed by the Python GC.
 #[enum_dispatch]
@@ -11,8 +11,6 @@ pub trait PyGcTraverse {
 }
 
 impl<T> PyGcTraverse for Py<T>
-where
-    Py<T>: AsPyPointer,
 {
     fn py_gc_traverse(&self, visit: &PyVisit<'_>) -> Result<(), PyTraverseError> {
         visit.call(self)

src/py_gc.rs

@@ -8,7 +8,7 @@ use pyo3::types::{PyDict, PyString};
 use pyo3::{intern, FromPyObject};
 
 use crate::input::Int;
-use jiter::{cached_py_string, pystring_fast_new, StringCacheMode};
+use jiter::{cached_py_string, StringCacheMode};
 
 pub trait SchemaDict<'py> {
     fn get_as<T>(&self, key: &Bound<'py, PyString>) -> PyResult<Option<T>>
@@ -148,11 +148,10 @@ pub fn extract_int(v: &Bound<'_, PyAny>) -> Option<Int> {
 
 pub(crate) fn new_py_string<'py>(py: Python<'py>, s: &str, cache_str: StringCacheMode) -> Bound<'py, PyString> {
     // we could use `bytecount::num_chars(s.as_bytes()) == s.len()` as orjson does, but it doesn't appear to be faster
-    let ascii_only = false;
     if matches!(cache_str, StringCacheMode::All) {
-        cached_py_string(py, s, ascii_only)
+        cached_py_string(py, s)
     } else {
-        pystring_fast_new(py, s, ascii_only)
+        PyString::new(py, s)
     }
 }