From patchwork Fri May 6 06:41:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kanavin X-Patchwork-Id: 7672 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66CC4C433F5 for ; Fri, 6 May 2022 06:42:05 +0000 (UTC) Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by mx.groups.io with SMTP id smtpd.web12.6544.1651819322929852395 for ; Thu, 05 May 2022 23:42:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20210112 header.b=npQugALJ; spf=pass (domain: gmail.com, ip: 209.85.218.41, mailfrom: alex.kanavin@gmail.com) Received: by mail-ej1-f41.google.com with SMTP id dk23so12624182ejb.8 for ; Thu, 05 May 2022 23:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o8oNPAISlXpL3C2BgswleDXAizNs5qvnvoR+jHrVmSI=; b=npQugALJzfqwVT638FqFEhXr/V3ko7Dx2yWISTy2me6VmQ24C489818AaJA1/OdCJ/ kPd7amoYpNSfdPNHe8i59MkfS6Zn3unSe7WKGFO6JfXocIWjV+fGPtUBvHmswk+yikZy kAywa969/kFjgWsjzWd0AncV+8PbYrUvE7u2lpyd8WGQLfmViB5YhMyESE63TOiHXFMA 0KOVclDkDmt8B7tYYDJUBpdS2PDxORiYDmlaDixCbBUlRBjChusM0zvfN8pu7Tcfj8ab c6TF5sGgDIWZSGDUt5OhrVU0q6nw9wH3XPbN1seTXF/5QFflhuhYOJpXlMlYX0hcfx1U zbhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o8oNPAISlXpL3C2BgswleDXAizNs5qvnvoR+jHrVmSI=; b=jFNqnwq19IW4ajQadhXLV9BBR2zU1nfZCfZXTLGj/yEOps4DBcyOlyMpX2qXSbvTI5 a1INAB8wXnFG732M2I0fQyrY5euyzJ0cRqhG4v+j1zvfe8t3f4QguG2EcNe1eJlxMFTh mGFjfo9xi15VO9q8auTtC0WAKpbDUlC3AGvSjBvg3pBESHJKmSXgoLHFnLXCaC37Mz9R L6vGaaVDCDSOGfmj8BaUjjX2rSi7mWQW+XOrW6jsnNZ793rNE5AkotHKJEf7Lu5+Uutd ZBZ35YWi9HWsKs4HnPz5xM6Iv1wRJjEbYVmixCD1V0edy6MY5iB9efl2YUgRXgucDXEV mSkA== X-Gm-Message-State: AOAM5312yW/hf/53yulQdntGTmRNP9jC+EXcL2X0W5sZO1FTprH5agoO j5/z3DeCUZRP2aDr3d7tNXoKtfqqwFA= X-Google-Smtp-Source: ABdhPJwidJqF1SIPPVc/kfdHLDmRTmx+3B9fnBBtk4YCeCRl4w+1Ow2zy/kH7Jhr7BPXeqEy1zjJHg== X-Received: by 2002:a17:907:1b20:b0:6da:649b:d99e with SMTP id mp32-20020a1709071b2000b006da649bd99emr1588648ejc.712.1651819321398; Thu, 05 May 2022 23:42:01 -0700 (PDT) Received: from Zen2.lab.linutronix.de. (ip-109-090-143-203.um36.pools.vodafone-ip.de. [109.90.143.203]) by smtp.gmail.com with ESMTPSA id s19-20020aa7c553000000b0042617ba63c1sm1819560edr.75.2022.05.05.23.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 23:42:00 -0700 (PDT) From: Alexander Kanavin X-Google-Original-From: Alexander Kanavin To: openembedded-core@lists.openembedded.org Cc: Alexander Kanavin , Alexander Kanavin Subject: [PATCH 2/3] python3-setuptools: upgrade 59.5.0 -> 62.1.0 Date: Fri, 6 May 2022 08:41:54 +0200 Message-Id: <20220506064155.2106140-2-alex@linutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220506064155.2106140-1-alex@linutronix.de> References: <20220506064155.2106140-1-alex@linutronix.de> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 06 May 2022 06:42:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165320 From: Alexander Kanavin 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 --- ...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 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 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.*)\.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 -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 - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Tim Orling - ---- - 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}"