From ea9fd34fd1341cb9f94a4857fc12bc11a4703131 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 10 Aug 2024 23:03:53 -0700 Subject: python3-daemon: Fix build with PEP-575 build backend Apply required backports Signed-off-by: Khem Raj --- ...-from-packaging-module-instead-of-setupto.patch | 44 ++++++++++++++++++++++ .../python/python3-daemon_3.0.1.bb | 3 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch (limited to 'meta-python/recipes-devtools') diff --git a/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch b/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch new file mode 100644 index 000000000..316f7d961 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch @@ -0,0 +1,44 @@ +From b7418ab4a3232431373bf0680c6b74fef06910de Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 10 Aug 2024 22:44:08 -0700 +Subject: [PATCH] Use version from packaging module instead of setuptools extern + +Fixes build problems when using PEP-575 build backend + + +Drop the patch on upgrading to >= 3.0.2 + +Upstream-Status: Backport [https://pagure.io/fork/khemraj/python-daemon/c/3bbc46967d35cd7e05677018bdc9d552efaeea3e?branch=main] + +Signed-off-by: Khem Raj +--- + test_version.py | 2 +- + version.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test_version.py b/test_version.py +index c43cd36..d0a124d 100644 +--- a/test_version.py ++++ b/test_version.py +@@ -23,7 +23,7 @@ import docutils.writers + import setuptools + import setuptools.command + import setuptools.dist +-from setuptools.extern.packaging.version import InvalidVersion ++from packaging.version import InvalidVersion + import testscenarios + import testtools + +diff --git a/version.py b/version.py +index 20d3ef3..fbdc462 100644 +--- a/version.py ++++ b/version.py +@@ -36,7 +36,7 @@ import setuptools.command.build + import setuptools.command.build_py + import setuptools.command.egg_info + import setuptools.dist +-import setuptools.extern.packaging.version ++import packaging.version + + + def ensure_class_bases_begin_with(namespace, class_name, base_class): diff --git a/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb index 715d3bf12..cb85262b4 100644 --- a/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb +++ b/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb @@ -11,8 +11,9 @@ RDEPENDS:${PN} = "python3-docutils \ LICENSE = "Apache-2.0 & GPL-3.0-only" LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta +SRC_URI += "file://0001-Use-version-from-packaging-module-instead-of-setupto.patch" SRC_URI[sha256sum] = "6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5" PYPI_PACKAGE = "python-daemon" -- cgit v1.2.3-54-g00ecf