From 4fccef6c551dc2704e972aaf3d9567daa238b14c Mon Sep 17 00:00:00 2001 From: Trevor Gamblin Date: Thu, 22 May 2025 08:51:50 -0400 Subject: [PATCH] python3-setuptools: upgrade 78.1.0 -> 80.8.0 Changelog: https://setuptools.pypa.io/en/latest/history.html#v80-8-0 Notably: - There was a temporary removal of the LICENSE file (restored in v80.8.0); - The easy_install module has been mostly removed; what remains is a temporary stub for compatibility purposes. Signed-off-by: Trevor Gamblin Signed-off-by: Richard Purdie --- ...ly-do-not-fetch-code-by-easy_install.patch | 37 ------------------- ...78.1.0.bb => python3-setuptools_80.8.0.bb} | 4 +- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch rename meta/recipes-devtools/python/{python3-setuptools_78.1.0.bb => python3-setuptools_80.8.0.bb} (89%) 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 deleted file mode 100644 index 785a2192c3..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 92363514224b0aeba065f83b868a15a2a03601ab 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 - -If NO_FETCH_BUILD is set, do not fetch code in easy_install. This avoids setup.py -trying to fetch missing dependencies at build time. - -This is only used by the deprecated codepath as implemented by setuptools3.bbclass, so -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 eb1b4c1..4fd8d14 100644 ---- a/setuptools/command/easy_install.py -+++ b/setuptools/command/easy_install.py -@@ -672,6 +672,11 @@ class easy_install(Command): - os.path.exists(tmpdir) and _rmtree(tmpdir) - - 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) -+ return None -+ - with self._tmpdir() as tmpdir: - if not isinstance(spec, Requirement): - if URL_SCHEME(spec): diff --git a/meta/recipes-devtools/python/python3-setuptools_78.1.0.bb b/meta/recipes-devtools/python/python3-setuptools_80.8.0.bb similarity index 89% rename from meta/recipes-devtools/python/python3-setuptools_78.1.0.bb rename to meta/recipes-devtools/python/python3-setuptools_80.8.0.bb index 7455ec41af..327eff5700 100644 --- a/meta/recipes-devtools/python/python3-setuptools_78.1.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_80.8.0.bb @@ -8,12 +8,10 @@ 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] = "18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54" +SRC_URI[sha256sum] = "49f7af965996f26d43c8ae34539c8d99c5042fbff34302ea151eaa9c207cd257" DEPENDS += "python3" -- 2.47.2