diff options
| author | Trevor Gamblin <tgamblin@baylibre.com> | 2025-05-22 08:51:50 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-05-27 09:01:16 +0100 |
| commit | a1bcc9faf7a8ae3e6b4ede8719628ec3f96cf48b (patch) | |
| tree | 854e82b6e16e300fb93c53c3d0c34d039b94d68d | |
| parent | 13f61738648dd844ae454354fcda7fbadc67e345 (diff) | |
| download | poky-a1bcc9faf7a8ae3e6b4ede8719628ec3f96cf48b.tar.gz | |
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.
(From OE-Core rev: 4fccef6c551dc2704e972aaf3d9567daa238b14c)
Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 37 | ||||
| -rw-r--r-- | meta/recipes-devtools/python/python3-setuptools_80.8.0.bb (renamed from meta/recipes-devtools/python/python3-setuptools_78.1.0.bb) | 4 |
2 files changed, 1 insertions, 40 deletions
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 @@ | |||
| 1 | From 92363514224b0aeba065f83b868a15a2a03601ab Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 | ||
| 4 | Subject: [PATCH] conditionally do not fetch code by easy_install | ||
| 5 | |||
| 6 | If NO_FETCH_BUILD is set, do not fetch code in easy_install. This avoids setup.py | ||
| 7 | trying to fetch missing dependencies at build time. | ||
| 8 | |||
| 9 | This is only used by the deprecated codepath as implemented by setuptools3.bbclass, so | ||
| 10 | when that ever gets removed this patch can also be deleted. | ||
| 11 | |||
| 12 | Upstream-Status: Denied [https://github.com/pypa/setuptools/issues/4735] | ||
| 13 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
| 14 | |||
| 15 | Update to apply against v75.6.0. | ||
| 16 | |||
| 17 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | ||
| 18 | --- | ||
| 19 | setuptools/command/easy_install.py | 5 +++++ | ||
| 20 | 1 file changed, 5 insertions(+) | ||
| 21 | |||
| 22 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | ||
| 23 | index eb1b4c1..4fd8d14 100644 | ||
| 24 | --- a/setuptools/command/easy_install.py | ||
| 25 | +++ b/setuptools/command/easy_install.py | ||
| 26 | @@ -672,6 +672,11 @@ class easy_install(Command): | ||
| 27 | os.path.exists(tmpdir) and _rmtree(tmpdir) | ||
| 28 | |||
| 29 | def easy_install(self, spec, deps: bool = False) -> Distribution | None: | ||
| 30 | + if os.environ.get('NO_FETCH_BUILD', None): | ||
| 31 | + log.error("ERROR: Do not try to fetch `%s' for building. " | ||
| 32 | + "Please add its native recipe to DEPENDS." % spec) | ||
| 33 | + return None | ||
| 34 | + | ||
| 35 | with self._tmpdir() as tmpdir: | ||
| 36 | if not isinstance(spec, Requirement): | ||
| 37 | 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 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 | |||
| 8 | 8 | ||
| 9 | CVE_PRODUCT = "python3-setuptools python:setuptools" | 9 | CVE_PRODUCT = "python3-setuptools python:setuptools" |
| 10 | 10 | ||
| 11 | SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" | ||
| 12 | |||
| 13 | SRC_URI += " \ | 11 | SRC_URI += " \ |
| 14 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" | 12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch" |
| 15 | 13 | ||
| 16 | SRC_URI[sha256sum] = "18fd474d4a82a5f83dac888df697af65afa82dec7323d09c3e37d1f14288da54" | 14 | SRC_URI[sha256sum] = "49f7af965996f26d43c8ae34539c8d99c5042fbff34302ea151eaa9c207cd257" |
| 17 | 15 | ||
| 18 | DEPENDS += "python3" | 16 | DEPENDS += "python3" |
| 19 | 17 | ||
