Skip to content

🐛 Fix Pydantic version check for version 2.10.x onwards #1255

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Feb 28, 2025
+4 −3
Merged

🐛 Fix Pydantic version check for version 2.10.x onwards #1255

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
978b78a
Fix context in model_dump for pydantic 2.10
asiunov Dec 23, 2024
93bdccd
Merge branch 'main' into asiunov/fix_pydantic_version_check
svlandeg Feb 20, 2025
fff3002
Merge branch 'main' into asiunov/fix_pydantic_version_check
svlandeg Feb 24, 2025
fded273
Apply suggestions from code review
svlandeg Feb 28, 2025
a2cec3f
Merge branch 'main' into asiunov/fix_pydantic_version_check
svlandeg Feb 28, 2025
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
3 changes: 2 additions & 1 deletion sqlmodel/_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@

# Reassign variable to make it reexported for mypy
PYDANTIC_VERSION = P_VERSION
IS_PYDANTIC_V2 = PYDANTIC_VERSION.startswith("2.")
PYDANTIC_MINOR_VERSION = tuple(int(i) for i in P_VERSION.split(".", 2)[:2])
IS_PYDANTIC_V2 = PYDANTIC_MINOR_VERSION[0] >= 2


if TYPE_CHECKING:
Expand Down
4 changes: 2 additions & 2 deletions sqlmodel/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

from ._compat import ( # type: ignore[attr-defined]
IS_PYDANTIC_V2,
PYDANTIC_VERSION,
PYDANTIC_MINOR_VERSION,
BaseConfig,
ModelField,
ModelMetaclass,
Expand Down Expand Up @@ -874,7 +874,7 @@ def model_dump(
warnings: Union[bool, Literal["none", "warn", "error"]] = True,
serialize_as_any: bool = False,
) -> Dict[str, Any]:
if PYDANTIC_VERSION >= "2.7.0":
if PYDANTIC_MINOR_VERSION >= (2, 7):
extra_kwargs: Dict[str, Any] = {
"context": context,
"serialize_as_any": serialize_as_any,
Expand Down