From: Alexander Kanavin <alex.kana...@gmail.com> This was held by numpy rejecting setuptools >= 60.x, however they added 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. 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' Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- ...ly-do-not-fetch-code-by-easy_install.patch | 6 ++-- .../python/python3-setuptools-scm_6.4.2.bb | 2 ++ ...nfig-append-STAGING_LIBDIR-python-sy.patch | 35 ------------------- ...59.5.0.bb => python3-setuptools_62.1.0.bb} | 7 ++-- 4 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch rename meta/recipes-devtools/python/{python3-setuptools_59.5.0.bb => python3-setuptools_62.1.0.bb} (87%) 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..5bbf14fd38 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 @@ -From da88c57fe03e4474ba20325edacf519e80c1d7a8 Mon Sep 17 00:00:00 2001 +From d26d10b6142ac08fe1b878ebc8c2c93c9b6803ed Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu....@windriver.com> Date: Tue, 17 Jul 2018 10:13:38 +0800 Subject: [PATCH] conditionally do not fetch code by easy_install @@ -15,10 +15,10 @@ Signed-off-by: Hongxu Jia <hongxu....@windriver.com> 1 file changed, 5 insertions(+) diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py -index fc848d0..c04a5de 100644 +index 444d3b3..61e445a 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py -@@ -642,6 +642,11 @@ class easy_install(Command): +@@ -648,6 +648,11 @@ class easy_install(Command): os.path.exists(tmpdir) and rmtree(tmpdir) def easy_install(self, spec, deps=False): diff --git a/meta/recipes-devtools/python/python3-setuptools-scm_6.4.2.bb b/meta/recipes-devtools/python/python3-setuptools-scm_6.4.2.bb index e09c598bf5..9aaae071d3 100644 --- a/meta/recipes-devtools/python/python3-setuptools-scm_6.4.2.bb +++ b/meta/recipes-devtools/python/python3-setuptools-scm_6.4.2.bb @@ -11,6 +11,8 @@ inherit pypi python_setuptools_build_meta UPSTREAM_CHECK_REGEX = "setuptools_scm-(?P<pver>.*)\.tar" +DEPENDS += "python3-tomli-native" + RDEPENDS:${PN} = "\ ${PYTHON_PN}-packaging \ ${PYTHON_PN}-pyparsing \ diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch b/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch deleted file mode 100644 index 3150187951..0000000000 --- a/meta/recipes-devtools/python/python3-setuptools/0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1ff575308248b183639c8cb14afee7c8572bd2b8 Mon Sep 17 00:00:00 2001 -From: Tim Orling <timothy.t.orl...@intel.com> -Date: Wed, 20 Oct 2021 17:38:10 +0000 -Subject: [PATCH] _distutils/sysconfig: append - STAGING_LIBDIR/python-sysconfigdata to sys.path - -When python modules set SETUPTOOLS_USE_DISTULS='local', this uses the -vendored _distutils in setuptools rather than distutils in the Standard -Library. This is needed so that target configuration can be used with -python3-setuptools-native. - -Based on python3/0001-distutils-sysconfig-append-STAGING_LIBDIR-python-sys.patch -from Alex Kanavin <alex.kana...@gmail.com> - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Tim Orling <timothy.t.orl...@intel.com> - ---- - setuptools/_distutils/sysconfig.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/setuptools/_distutils/sysconfig.py b/setuptools/_distutils/sysconfig.py -index d36d94f..616eb91 100644 ---- a/setuptools/_distutils/sysconfig.py -+++ b/setuptools/_distutils/sysconfig.py -@@ -484,6 +484,8 @@ def _init_posix(): - multiarch=getattr(sys.implementation, '_multiarch', ''), - ), - ) -+ if 'STAGING_LIBDIR' in os.environ: -+ sys.path.append(os.environ['STAGING_LIBDIR']+'/python-sysconfigdata') - try: - _temp = __import__(name, globals(), locals(), ['build_time_vars'], 0) - except ImportError: diff --git a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb b/meta/recipes-devtools/python/python3-setuptools_62.1.0.bb similarity index 87% rename from meta/recipes-devtools/python/python3-setuptools_59.5.0.bb rename to meta/recipes-devtools/python/python3-setuptools_62.1.0.bb index f2810e18d3..420c73d45f 100644 --- a/meta/recipes-devtools/python/python3-setuptools_59.5.0.bb +++ b/meta/recipes-devtools/python/python3-setuptools_62.1.0.bb @@ -8,12 +8,9 @@ inherit pypi python_setuptools_build_meta SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" -SRC_URI += "\ - file://0001-change-shebang-to-python3.patch \ - file://0001-_distutils-sysconfig-append-STAGING_LIBDIR-python-sy.patch \ -" +SRC_URI += "file://0001-change-shebang-to-python3.patch" -SRC_URI[sha256sum] = "d144f85102f999444d06f9c0e8c737fd0194f10f2f7e5fdb77573f6e2fa4fad0" +SRC_URI[sha256sum] = "47c7b0c0f8fc10eec4cf1e71c6fdadf8decaa74ffa087e68cd1c20db7ad6a592" DEPENDS += "${PYTHON_PN}" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#165320): https://lists.openembedded.org/g/openembedded-core/message/165320 Mute This Topic: https://lists.openembedded.org/mt/90928568/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-