diff options
| author | Bai, Haiqing <Haiqing.Bai@windriver.com> | 2026-04-03 03:38:41 +0000 |
|---|---|---|
| committer | Khem Raj <khem.raj@oss.qualcomm.com> | 2026-04-03 01:05:45 -0700 |
| commit | dab9004db6063ad3ad16b94a91f5e47fbde8db45 (patch) | |
| tree | 3c655a4ee8ab84dcfaaa7fc7cb7b470c45e7a5b5 /meta-python | |
| parent | 584fec0f74ad7c3ebe3bc5794be93382d4d386eb (diff) | |
| download | meta-openembedded-dab9004db6063ad3ad16b94a91f5e47fbde8db45.tar.gz | |
python3-stopit: Fixed the deprecated pkg_resources issue
pkg_resources is deprecated as an API. The pkg_resources package
has been removed from setuptools, so the way of obtaining the
version needs to be replaced with importlib.metadata module.
Signed-off-by: Bai, Haiqing <Haiqing.Bai@windriver.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
Diffstat (limited to 'meta-python')
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-stopit/0001-Drop-the-deprecated-pkg_resources.patch | 38 | ||||
| -rw-r--r-- | meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb | 6 |
2 files changed, 43 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python3-stopit/0001-Drop-the-deprecated-pkg_resources.patch b/meta-python/recipes-devtools/python/python3-stopit/0001-Drop-the-deprecated-pkg_resources.patch new file mode 100644 index 0000000000..4252386384 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-stopit/0001-Drop-the-deprecated-pkg_resources.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From b72825c89724c2c3b4c9c60d90c9d4ad597eead0 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: "Bai, Haiqing" <Haiqing.Bai@windriver.com> | ||
| 3 | Date: Thu, 2 Apr 2026 08:40:26 +0000 | ||
| 4 | Subject: [PATCH] Drop the deprecated pkg_resources | ||
| 5 | |||
| 6 | pkg_resources is deprecated as an API. The pkg_resources package | ||
| 7 | is slated for removal, so the way of obtaining the version needs | ||
| 8 | to be updated. | ||
| 9 | |||
| 10 | Upstream-Status: Inactive-Upstream [lastcommit: Jan/2024 lastrelease: Feb/2018] | ||
| 11 | |||
| 12 | Signed-off-by: Bai, Haiqing <Haiqing.Bai@windriver.com> | ||
| 13 | --- | ||
| 14 | src/stopit/__init__.py | 4 ++-- | ||
| 15 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/src/stopit/__init__.py b/src/stopit/__init__.py | ||
| 18 | index 6ca0180..5ddfa4a 100644 | ||
| 19 | --- a/src/stopit/__init__.py | ||
| 20 | +++ b/src/stopit/__init__.py | ||
| 21 | @@ -7,7 +7,7 @@ stopit | ||
| 22 | Public resources from ``stopit`` | ||
| 23 | """ | ||
| 24 | |||
| 25 | -import pkg_resources | ||
| 26 | +from importlib.metadata import version | ||
| 27 | |||
| 28 | from .utils import LOG, TimeoutException | ||
| 29 | from .threadstop import ThreadingTimeout, async_raise, threading_timeoutable | ||
| 30 | @@ -15,7 +15,7 @@ from .signalstop import SignalTimeout, signal_timeoutable | ||
| 31 | |||
| 32 | # PEP 396 style version marker | ||
| 33 | try: | ||
| 34 | - __version__ = pkg_resources.get_distribution(__name__).version | ||
| 35 | + __version__ = version(__name__) | ||
| 36 | except: | ||
| 37 | LOG.warning("Could not get the package version from pkg_resources") | ||
| 38 | __version__ = 'unknown' | ||
diff --git a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb index a952722619..a83adffcd2 100644 --- a/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb +++ b/meta-python/recipes-devtools/python/python3-stopit_1.1.2.bb | |||
| @@ -2,7 +2,6 @@ SUMMARY = "Raise asynchronous exceptions in other threads, control the timeout o | |||
| 2 | HOMEPAGE = "https://pypi.org/project/stopit/" | 2 | HOMEPAGE = "https://pypi.org/project/stopit/" |
| 3 | SECTION = "devel/python" | 3 | SECTION = "devel/python" |
| 4 | 4 | ||
| 5 | SRC_URI += " file://LICENSE " | ||
| 6 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
| 7 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=497c556f42b1355b64190da2f3d88f93" | 6 | LIC_FILES_CHKSUM = "file://${UNPACKDIR}/LICENSE;md5=497c556f42b1355b64190da2f3d88f93" |
| 8 | 7 | ||
| @@ -10,6 +9,11 @@ SRC_URI[sha256sum] = "f7f39c583fd92027bd9d06127b259aee7a5b7945c1f1fa56263811e1e7 | |||
| 10 | 9 | ||
| 11 | inherit pypi setuptools3 | 10 | inherit pypi setuptools3 |
| 12 | 11 | ||
| 12 | SRC_URI += "\ | ||
| 13 | file://LICENSE \ | ||
| 14 | file://0001-Drop-the-deprecated-pkg_resources.patch \ | ||
| 15 | " | ||
| 16 | |||
| 13 | RDEPENDS:${PN} += "\ | 17 | RDEPENDS:${PN} += "\ |
| 14 | python3-setuptools \ | 18 | python3-setuptools \ |
| 15 | " | 19 | " |
