Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support free-threaded Python 3.13t #1628

Merged
merged 3 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ jobs:
HYPOTHESIS_PROFILE: slow
# TODO: remove --inline-snapshot=disable after https://github.com/15r10nk/inline-snapshot/issues/192
PYTEST_ADDOPTS: ${{ endsWith(matrix.python-version, 't') && '--parallel-threads=2 --inline-snapshot=disable' || '' }}
# TODO: add `gil_used = false` to the PyO3 `#[pymodule]` when test suite is ok
PYTHON_GIL: ${{ endsWith(matrix.python-version, 't') && '0' || '1' }}

test-os:
name: test on ${{ matrix.os }}
Expand Down Expand Up @@ -505,7 +503,7 @@ jobs:
fail-fast: false
matrix:
os: [linux, windows, macos]
interpreter: ['3.9', '3.10', '3.11', '3.12', '3.13']
interpreter: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.13t']
include:
# standard runners with override for macos arm
- os: linux
Expand Down
51 changes: 22 additions & 29 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,33 +106,26 @@ pub fn build_info() -> String {
)
}

#[pymodule]
fn _pydantic_core(py: Python, m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add("__version__", get_pydantic_core_version())?;
m.add("build_profile", env!("PROFILE"))?;
m.add("build_info", build_info())?;
m.add("_recursion_limit", recursion_guard::RECURSION_GUARD_LIMIT)?;
m.add("PydanticUndefined", PydanticUndefinedType::new(py))?;
m.add_class::<PydanticUndefinedType>()?;
m.add_class::<PySome>()?;
m.add_class::<SchemaValidator>()?;
m.add_class::<ValidationError>()?;
m.add_class::<SchemaError>()?;
m.add_class::<PydanticCustomError>()?;
m.add_class::<PydanticKnownError>()?;
m.add_class::<PydanticOmit>()?;
m.add_class::<PydanticUseDefault>()?;
m.add_class::<PydanticSerializationError>()?;
m.add_class::<PydanticSerializationUnexpectedValue>()?;
m.add_class::<PyUrl>()?;
m.add_class::<PyMultiHostUrl>()?;
m.add_class::<ArgsKwargs>()?;
m.add_class::<SchemaSerializer>()?;
m.add_class::<TzInfo>()?;
m.add_function(wrap_pyfunction!(to_json, m)?)?;
m.add_function(wrap_pyfunction!(from_json, m)?)?;
m.add_function(wrap_pyfunction!(to_jsonable_python, m)?)?;
m.add_function(wrap_pyfunction!(list_all_errors, m)?)?;
m.add_function(wrap_pyfunction!(validate_core_schema, m)?)?;
Ok(())
#[pymodule(gil_used = false)]
mod _pydantic_core {
#[allow(clippy::wildcard_imports)]
use super::*;

#[pymodule_export]
use crate::{
from_json, list_all_errors, to_json, to_jsonable_python, validate_core_schema, ArgsKwargs, PyMultiHostUrl,
PySome, PyUrl, PydanticCustomError, PydanticKnownError, PydanticOmit, PydanticSerializationError,
PydanticSerializationUnexpectedValue, PydanticUndefinedType, PydanticUseDefault, SchemaError, SchemaSerializer,
SchemaValidator, TzInfo, ValidationError,
};

#[pymodule_init]
fn module_init(m: &Bound<'_, PyModule>) -> PyResult<()> {
m.add("__version__", get_pydantic_core_version())?;
m.add("build_profile", env!("PROFILE"))?;
m.add("build_info", build_info())?;
m.add("_recursion_limit", recursion_guard::RECURSION_GUARD_LIMIT)?;
m.add("PydanticUndefined", PydanticUndefinedType::new(m.py()))?;
Ok(())
}
}
6 changes: 1 addition & 5 deletions src/validators/decimal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,11 +182,7 @@ impl Validator for DecimalValidator {

if let Some(multiple_of) = &self.multiple_of {
// fraction = (decimal / multiple_of) % 1
let fraction = unsafe {
let division = decimal.div(multiple_of)?;
let one = 1u8.into_pyobject(py)?;
Bound::from_owned_ptr_or_err(py, pyo3::ffi::PyNumber_Remainder(division.as_ptr(), one.as_ptr()))?
};
let fraction = (decimal.div(multiple_of)?).rem(1)?;
let zero = 0u8.into_pyobject(py)?;
if !fraction.eq(&zero)? {
return Err(ValError::new(
Expand Down
Loading