diff mbox series

[meta-python] python3-jsonrpcserver: upgrade 5.0.7 -> 5.0.8

Message ID 20220826020450.2839319-1-yi.zhao@windriver.com
State Under Review
Headers show
Series [meta-python] python3-jsonrpcserver: upgrade 5.0.7 -> 5.0.8 | expand

Commit Message

Yi Zhao Aug. 26, 2022, 2:04 a.m. UTC 
Drop local patch which has been merged upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 ....0.7.bb => python3-jsonrpcserver_5.0.8.bb} |  2 +-
 ...b.resources-instead-of-pkg_resources.patch | 44 -------------------
 .../python/python3-jsonrpcserver_%.bbappend   |  5 ---
 3 files changed, 1 insertion(+), 50 deletions(-)
 rename meta-python/recipes-devtools/python/{python3-jsonrpcserver_5.0.7.bb => python3-jsonrpcserver_5.0.8.bb} (84%)
 delete mode 100644 recipes-devtools/python/python3-jsonrpcserver/0001-Use-importlib.resources-instead-of-pkg_resources.patch
 delete mode 100644 recipes-devtools/python/python3-jsonrpcserver_%.bbappend
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.7.bb b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.8.bb
similarity index 84%
rename from meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.7.bb
rename to meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.8.bb
index 12e900379..6dff9b85b 100644
--- a/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.7.bb
+++ b/meta-python/recipes-devtools/python/python3-jsonrpcserver_5.0.8.bb
@@ -3,7 +3,7 @@  HOMEPAGE = "https://github.com/explodinglabs/jsonrpcserver"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=61b63ea9d36f6fb63ddaaaac8265304f"
 
-SRC_URI[sha256sum] = "b15d3fd043ad0c40b2ff17f7df2ddaec2e880bb923b40d133939a107c97fde5c"
+SRC_URI[sha256sum] = "5150071e4abc9a93f086aa0fd0004dfe0410de66adfaaf513613baa2c2fc00d7"
 
 inherit pypi setuptools3
 
diff --git a/recipes-devtools/python/python3-jsonrpcserver/0001-Use-importlib.resources-instead-of-pkg_resources.patch b/recipes-devtools/python/python3-jsonrpcserver/0001-Use-importlib.resources-instead-of-pkg_resources.patch
deleted file mode 100644
index 2d1a8c97c..000000000
--- a/recipes-devtools/python/python3-jsonrpcserver/0001-Use-importlib.resources-instead-of-pkg_resources.patch
+++ /dev/null
@@ -1,44 +0,0 @@ 
-From 4220c6a02bc03ff8c6cc4b3bee168a1351a3ce39 Mon Sep 17 00:00:00 2001
-From: Sam Van Den Berge <sam.van.den.berge@gmail.com>
-Date: Fri, 29 Jul 2022 15:53:37 +0200
-Subject: [PATCH] Use importlib.resources instead of pkg_resources
-
-From the setuptools website [1]:
-
-Use of pkg_resources is discouraged in favor of importlib.resources,
-importlib.metadata, and their backports (importlib_resources,
-importlib_metadata). Please consider using those libraries instead of
-pkg_resources.
-
-[1]: https://setuptools.pypa.io/en/latest/pkg_resources.html
-
-Signed-off-by: Sam Van Den Berge <sam.van.den.berge@gmail.com>
----
- jsonrpcserver/main.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/jsonrpcserver/main.py b/jsonrpcserver/main.py
-index 0397a58..ac1855f 100644
---- a/jsonrpcserver/main.py
-+++ b/jsonrpcserver/main.py
-@@ -13,7 +13,7 @@ from typing import Any, Callable, Dict, List, Optional, Union, cast
- import json
- 
- from jsonschema.validators import validator_for  # type: ignore
--from pkg_resources import resource_string
-+import importlib.resources
- 
- from .dispatcher import dispatch_to_response_pure, Deserialized
- from .methods import Methods, global_methods
-@@ -26,7 +26,7 @@ default_deserializer = json.loads
- 
- # Prepare the jsonschema validator. This is global so it loads only once, not every
- # time dispatch is called.
--schema = json.loads(resource_string(__name__, "request-schema.json"))
-+schema = json.loads(importlib.resources.read_text(__package__, "request-schema.json"))
- klass = validator_for(schema)
- klass.check_schema(schema)
- default_validator = klass(schema).validate
--- 
-2.34.1
-
diff --git a/recipes-devtools/python/python3-jsonrpcserver_%.bbappend b/recipes-devtools/python/python3-jsonrpcserver_%.bbappend
deleted file mode 100644
index 23cdf070b..000000000
--- a/recipes-devtools/python/python3-jsonrpcserver_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@ 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI = "\
-        file://0001-Use-importlib.resources-instead-of-pkg_resources.patch \
-"