python3-pydantic-core: Fix build with python 3.12.4

This needs to be upgraded to 2.19+ but until then
backport a fix to keep it building.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Tim Orling <ticotimo@gmail.com>
This commit is contained in:
Khem Raj 2024-06-12 12:46:20 -07:00
parent 3eb7dd257b
commit 39d164f0c3
No known key found for this signature in database
GPG Key ID: BB053355919D3314
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 0dcca2ed6a83ebbc944ec8cbd2f67ffec8043461 Mon Sep 17 00:00:00 2001
From: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Date: Wed, 22 May 2024 07:44:10 -0700
Subject: [PATCH] Fix generate_self_schema for Python 3.12+ (#1299)
Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/a7620419383a69bd2b28ab953c9a17f6ed35bb9a]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
generate_self_schema.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/generate_self_schema.py b/generate_self_schema.py
index 8d27247..109fca0 100644
--- a/generate_self_schema.py
+++ b/generate_self_schema.py
@@ -189,7 +189,12 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]:
def eval_forward_ref(type_: Any) -> Any:
try:
- return type_._evaluate(core_schema.__dict__, None, set())
+ try:
+ # Python 3.12+
+ return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set())
+ except TypeError:
+ # Python 3.9+
+ return type_._evaluate(core_schema.__dict__, None, set())
except TypeError:
# for Python 3.8
return type_._evaluate(core_schema.__dict__, None)

View File

@ -8,7 +8,8 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c"
SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch"
SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch \
file://0001-Fix-generate_self_schema-for-Python-3.12-1299.patch"
SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad"
DEPENDS = "python3-maturin-native python3-typing-extensions"