From db72b55dbfbbbe5da241bc7c53caecc75d9de19b Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 4 Jun 2025 16:45:15 +0800 Subject: python3-jsonschema: upgrade 4.23.0 -> 4.24.0 d71f96a6523875c9694fcdf468c9f458323d07f2.patch removed since it's included in 4.24.0 (From OE-Core rev: a7c325f3d083b76842440aa1efa997fac53a36c9) Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../d71f96a6523875c9694fcdf468c9f458323d07f2.patch | 44 ------------------- .../python/python3-jsonschema_4.23.0.bb | 51 ---------------------- .../python/python3-jsonschema_4.24.0.bb | 49 +++++++++++++++++++++ 3 files changed, 49 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch delete mode 100644 meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb create mode 100644 meta/recipes-devtools/python/python3-jsonschema_4.24.0.bb diff --git a/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch b/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch deleted file mode 100644 index 65cc2b4cf0..0000000000 --- a/meta/recipes-devtools/python/python3-jsonschema/d71f96a6523875c9694fcdf468c9f458323d07f2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From d71f96a6523875c9694fcdf468c9f458323d07f2 Mon Sep 17 00:00:00 2001 -From: Julian Berman -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 ---- - 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 deleted file mode 100644 index 82b7bb23ed..0000000000 --- a/meta/recipes-devtools/python/python3-jsonschema_4.23.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "An implementation of JSON Schema validation for Python" -HOMEPAGE = "https://github.com/python-jsonschema/jsonschema" -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 - -PACKAGES =+ "${PN}-tests" -FILES:${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/jsonschema/tests" - -DEPENDS += "python3-hatch-fancy-pypi-readme-native python3-hatch-vcs-native " - -PACKAGECONFIG ??= "format" -PACKAGECONFIG[format] = ",,,\ - python3-idna \ - python3-jsonpointer \ - python3-webcolors \ - python3-rfc3987 \ - python3-rfc3339-validator \ -" -PACKAGECONFIG[format-nongpl] = ",,,\ - python3-idna \ - python3-jsonpointer \ - python3-webcolors \ - python3-rfc3986-validator \ - python3-rfc3339-validator \ -" - -RDEPENDS:${PN} += " \ - python3-attrs \ - python3-core \ - python3-datetime \ - python3-io \ - python3-json \ - python3-jsonschema-specifications \ - python3-netclient \ - python3-numbers \ - python3-pprint \ - python3-pyrsistent \ - python3-referencing \ - python3-zipp \ -" - -RDEPENDS:${PN}-tests = "${PN}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-devtools/python/python3-jsonschema_4.24.0.bb b/meta/recipes-devtools/python/python3-jsonschema_4.24.0.bb new file mode 100644 index 0000000000..7a5f4a09a6 --- /dev/null +++ b/meta/recipes-devtools/python/python3-jsonschema_4.24.0.bb @@ -0,0 +1,49 @@ +SUMMARY = "An implementation of JSON Schema validation for Python" +HOMEPAGE = "https://github.com/python-jsonschema/jsonschema" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8 \ + file://json/LICENSE;md5=9d4de43111d33570c8fe49b4cb0e01af" + +SRC_URI[sha256sum] = "0b4e8069eb12aedfa881333004bccaec24ecef5a8a6a4b6df142b2cc9599d196" + +inherit pypi python_hatchling + +PACKAGES =+ "${PN}-tests" +FILES:${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/jsonschema/tests" + +DEPENDS += "python3-hatch-fancy-pypi-readme-native python3-hatch-vcs-native " + +PACKAGECONFIG ??= "format" +PACKAGECONFIG[format] = ",,,\ + python3-idna \ + python3-jsonpointer \ + python3-webcolors \ + python3-rfc3987 \ + python3-rfc3339-validator \ +" +PACKAGECONFIG[format-nongpl] = ",,,\ + python3-idna \ + python3-jsonpointer \ + python3-webcolors \ + python3-rfc3986-validator \ + python3-rfc3339-validator \ +" + +RDEPENDS:${PN} += " \ + python3-attrs \ + python3-core \ + python3-datetime \ + python3-io \ + python3-json \ + python3-jsonschema-specifications \ + python3-netclient \ + python3-numbers \ + python3-pprint \ + python3-pyrsistent \ + python3-referencing \ + python3-zipp \ +" + +RDEPENDS:${PN}-tests = "${PN}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf