diff mbox series

python3-setuptools: upgrade 72.1.0 -> 75.6.0

Message ID 20241121161620.2141006-1-tgamblin@baylibre.com
State New
Headers show
Series python3-setuptools: upgrade 72.1.0 -> 75.6.0 | expand

Commit Message

Trevor Gamblin Nov. 21, 2024, 4:16 p.m. UTC 
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.

Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
---
 ...onally-do-not-fetch-code-by-easy_install.patch | 15 +++++++++++----
 ...ols_72.1.0.bb => python3-setuptools_75.6.0.bb} |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)
 rename meta/recipes-devtools/python/{python3-setuptools_72.1.0.bb => python3-setuptools_75.6.0.bb} (95%)
diff mbox series

Patch

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 16b316e9cc2..527160735f0 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 <hongxu.jia@windriver.com>
 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 <hongxu.jia@windriver.com>
+
+Update to apply against v75.6.0.
+
+Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
 ---
  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_75.6.0.bb
similarity index 95%
rename from meta/recipes-devtools/python/python3-setuptools_72.1.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_75.6.0.bb
index 5a01111934c..c0e4b7031d7 100644
--- a/meta/recipes-devtools/python/python3-setuptools_72.1.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_75.6.0.bb
@@ -13,7 +13,7 @@  SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-e
 SRC_URI += " \
             file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = "8d243eff56d095e5817f796ede6ae32941278f542e0f941867cc05ae52b162ec"
+SRC_URI[sha256sum] = "8199222558df7c86216af4f84c30e9b34a61d8ba19366cc914424cdbd28252f6"
 
 DEPENDS += "python3"