From 86cd39e304b1ee23dba3cbf676ed1bbb488ac6ce Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 21 Nov 2024 11:16:20 -0500 Subject: python3-setuptools: upgrade 72.1.0 -> 75.6.0 Changelog: https://github.com/pypa/setuptools/blob/main/NEWS.rst 0001-conditionally-do-not-fetch-code-by-easy_install.patch had to be adjusted to apply on top of 75.6.0. (From OE-Core rev: 6d7e621ef133d625e8405c74a9dba712b8692064) Signed-off-by: Trevor Gamblin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- ...ionally-do-not-fetch-code-by-easy_install.patch | 15 ++++-- .../python/python3-setuptools_72.1.0.bb | 57 ---------------------- .../python/python3-setuptools_75.6.0.bb | 57 ++++++++++++++++++++++ 3 files changed, 68 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools_72.1.0.bb create mode 100644 meta/recipes-devtools/python/python3-setuptools_75.6.0.bb diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 16b316e9cc..527160735f 100644 --- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch @@ -1,4 +1,4 @@ -From 80fe63816eb3bfd1f5b6d354e1f2442805cff4e0 Mon Sep 17 00:00:00 2001 +From 00611eb8151825632bc36c189109626d9223037f Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -11,18 +11,22 @@ when that ever gets removed this patch can also be deleted. Upstream-Status: Denied [https://github.com/pypa/setuptools/issues/4735] Signed-off-by: Hongxu Jia + +Update to apply against v75.6.0. + +Signed-off-by: Trevor Gamblin --- setuptools/command/easy_install.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index 858fb20..62bd853 100644 +index 66fe68f7a..8647c2082 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -672,6 +672,11 @@ class easy_install(Command): +@@ -673,6 +673,11 @@ class easy_install(Command): os.path.exists(tmpdir) and _rmtree(tmpdir) - def easy_install(self, spec, deps=False): + def easy_install(self, spec, deps: bool = False) -> Distribution | None: + if os.environ.get('NO_FETCH_BUILD', None): + log.error("ERROR: Do not try to fetch `%s' for building. " + "Please add its native recipe to DEPENDS." % spec) @@ -31,3 +35,6 @@ index 858fb20..62bd853 100644 with self._tmpdir() as tmpdir: if not isinstance(spec, Requirement): if URL_SCHEME(spec): +-- +2.39.5 + diff --git a/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb b/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb deleted file mode 100644 index 5a01111934..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" -HOMEPAGE = "https://pypi.org/project/setuptools" -SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" - -inherit pypi python_setuptools_build_meta - -CVE_PRODUCT = "python3-setuptools python:setuptools" - -SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" - -SRC_URI += " \ - file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" - -SRC_URI[sha256sum] = "8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec" - -DEPENDS += "python3" - -RDEPENDS:${PN} = "\ - python3-compile \ - python3-compression \ - python3-ctypes \ - python3-email \ - python3-html \ - python3-json \ - python3-netserver \ - python3-numbers \ - python3-pickle \ - python3-pkg-resources \ - python3-pkgutil \ - python3-plistlib \ - python3-shell \ - python3-stringold \ - python3-threading \ - python3-unittest \ - python3-unixadmin \ - python3-xml \ -" - -BBCLASSEXTEND = "native nativesdk" - -# The pkg-resources module can be used by itself, without the package downloader -# and easy_install. Ship it in a separate package so that it can be used by -# minimal distributions. -PACKAGES =+ "python3-pkg-resources " -FILES:python3-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" -RDEPENDS:python3-pkg-resources = "\ - python3-compression \ - python3-email \ - python3-plistlib \ - python3-pprint \ -" - -# This used to use the bootstrap install which didn't compile. Until we bump the -# tmpdir version we can't compile the native otherwise the sysroot unpack fails -INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" diff --git a/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb b/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb new file mode 100644 index 0000000000..c0e4b7031d --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb @@ -0,0 +1,57 @@ +SUMMARY = "Download, build, install, upgrade, and uninstall Python packages" +HOMEPAGE = "https://pypi.org/project/setuptools" +SECTION = "devel/python" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" + +inherit pypi python_setuptools_build_meta + +CVE_PRODUCT = "python3-setuptools python:setuptools" + +SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" + +SRC_URI += " \ + file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" + +SRC_URI[sha256sum] = "8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6" + +DEPENDS += "python3" + +RDEPENDS:${PN} = "\ + python3-compile \ + python3-compression \ + python3-ctypes \ + python3-email \ + python3-html \ + python3-json \ + python3-netserver \ + python3-numbers \ + python3-pickle \ + python3-pkg-resources \ + python3-pkgutil \ + python3-plistlib \ + python3-shell \ + python3-stringold \ + python3-threading \ + python3-unittest \ + python3-unixadmin \ + python3-xml \ +" + +BBCLASSEXTEND = "native nativesdk" + +# The pkg-resources module can be used by itself, without the package downloader +# and easy_install. Ship it in a separate package so that it can be used by +# minimal distributions. +PACKAGES =+ "python3-pkg-resources " +FILES:python3-pkg-resources = "${PYTHON_SITEPACKAGES_DIR}/pkg_resources/*" +RDEPENDS:python3-pkg-resources = "\ + python3-compression \ + python3-email \ + python3-plistlib \ + python3-pprint \ +" + +# This used to use the bootstrap install which didn't compile. Until we bump the +# tmpdir version we can't compile the native otherwise the sysroot unpack fails +INSTALL_WHEEL_COMPILE_BYTECODE:class-native = "--no-compile-bytecode" -- cgit v1.2.3-54-g00ecf