diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:57:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
| commit | 6343a4168482183ac6b73a3e7045ef5b55df0e8e (patch) | |
| tree | 4d8233cb1839dd4d48c110c213cd6df758a3e99c /meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | |
| parent | ff5bead3bc13a9bf534f722ff24d6d93696a2284 (diff) | |
| download | poky-6343a4168482183ac6b73a3e7045ef5b55df0e8e.tar.gz | |
python3-setuptools: upgrade 59.5.0 -> 62.3.1
This was held by numpy rejecting setuptools >= 60.x,
however it got a workaround in recent point releases
and so the upgrade can proceed.
Drop 0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch
as changed code completely removed upstream.
Replicate another distutils/sysconfig.py fix from python recipe via
0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch
Add a tomli build dependency to python3-setuptools-scm as new
setuptools exposes:
| File "/srv/work/alex/poky/build-64-alt/tmp/work/x86_64-linux/python3-setuptools-scm-native/6.4.2-r0/setuptools_scm-6.4.2/src/setuptools_scm/config.py", line 59, in _lazy_tomli_load
| from tomli import loads
| ModuleNotFoundError: No module named 'tomli'
(From OE-Core rev: 0907866325fbfb5774e1a3f0ba0cf110d9b9b663)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch')
| -rw-r--r-- | meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch index 5e2ee454da..a2b7a519af 100644 --- a/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch +++ b/meta/recipes-devtools/python/files/0001-conditionally-do-not-fetch-code-by-easy_install.patch | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | From da88c57fe03e4474ba20325edacf519e80c1d7a8 Mon Sep 17 00:00:00 2001 | 1 | From d1b4fa4a99774878035a0f664ec0d9686e7f0c89 Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 | 3 | Date: Tue, 17 Jul 2018 10:13:38 +0800 |
| 4 | Subject: [PATCH] conditionally do not fetch code by easy_install | 4 | Subject: [PATCH] conditionally do not fetch code by easy_install |
| @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
| 15 | 1 file changed, 5 insertions(+) | 15 | 1 file changed, 5 insertions(+) |
| 16 | 16 | ||
| 17 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py | 17 | diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py |
| 18 | index fc848d0..c04a5de 100644 | 18 | index 444d3b3..61e445a 100644 |
| 19 | --- a/setuptools/command/easy_install.py | 19 | --- a/setuptools/command/easy_install.py |
| 20 | +++ b/setuptools/command/easy_install.py | 20 | +++ b/setuptools/command/easy_install.py |
| 21 | @@ -642,6 +642,11 @@ class easy_install(Command): | 21 | @@ -648,6 +648,11 @@ class easy_install(Command): |
| 22 | os.path.exists(tmpdir) and rmtree(tmpdir) | 22 | os.path.exists(tmpdir) and rmtree(tmpdir) |
| 23 | 23 | ||
| 24 | def easy_install(self, spec, deps=False): | 24 | def easy_install(self, spec, deps=False): |