From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 30 Oct 2024 17:08:25 +0000 (-0700)
Subject: python3-jsonschema: Fix annotation for validator_for's default
X-Git-Tag: yocto-5.2~1446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bf9241787574bad15e685d8f956f33719bac749;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

python3-jsonschema: Fix annotation for validator_for's default

Backport the fix, it helps some ptests on meta-python packages
e.g. pydantic

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch b/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch
new file mode 100644
index 00000000000..65cc2b4cf0a
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch
@@ -0,0 +1,44 @@
+From d71f96a6523875c9694fcdf468c9f458323d07f2 Mon Sep 17 00:00:00 2001
+From: Julian Berman <Julian@GrayVines.com>
+Date: Thu, 17 Oct 2024 09:36:35 -0400
+Subject: [PATCH] Fix the annotation for validator_for's default.
+
+This still doesn't seem to satisfy mypy, so tell it to be quiet.
+
+Upstream-Status: Backport [https://github.com/python-jsonschema/jsonschema/commit/d71f96a6523875c9694fcdf468c9f458323d07f2]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ jsonschema/validators.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/jsonschema/validators.py b/jsonschema/validators.py
+index 85c39160..b8ca3bd4 100644
+--- a/jsonschema/validators.py
++++ b/jsonschema/validators.py
+@@ -857,7 +857,7 @@ def extend(
+     version="draft2020-12",
+ )
+ 
+-_LATEST_VERSION = Draft202012Validator
++_LATEST_VERSION: type[Validator] = Draft202012Validator
+ 
+ 
+ class _RefResolver:
+@@ -1334,7 +1334,7 @@ def validate(instance, schema, cls=None, *args, **kwargs):  # noqa: D417
+ 
+ def validator_for(
+     schema,
+-    default: Validator | _utils.Unset = _UNSET,
++    default: type[Validator] | _utils.Unset = _UNSET,
+ ) -> type[Validator]:
+     """
+     Retrieve the validator class appropriate for validating the given schema.
+@@ -1396,7 +1396,7 @@ class is returned:
+     DefaultValidator = _LATEST_VERSION if default is _UNSET else default
+ 
+     if schema is True or schema is False or "$schema" not in schema:
+-        return DefaultValidator
++        return DefaultValidator  # type: ignore[return-value]
+     if schema["$schema"] not in _META_SCHEMAS and default is _UNSET:
+         warn(
+             (
diff --git a/meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb b/meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb
index 126258255d7..82b7bb23ed7 100644
--- a/meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb
+++ b/meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb
@@ -4,6 +4,8 @@ LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \
                     file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af"
 
+SRC_URI += "file://d71f96a6523875c9694fcdf468c9f458323d07f2.patch"
+
 SRC_URI[sha256sum] = "d71497fef26351a33265337fa77ffeb82423f3ea21283cd9467bb03999266bc4"
 
 inherit pypi python_hatchling