From patchwork Tue Mar 8 19:42:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4971 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 29D9CC433EF for ; Tue, 8 Mar 2022 19:42:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.12430.1646768554081816303 for ; Tue, 08 Mar 2022 11:42:34 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C10B91650 for ; Tue, 8 Mar 2022 11:42:33 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6B6063FA45 for ; Tue, 8 Mar 2022 11:42:33 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 1/2] poetry-core: clean up class Date: Tue, 8 Mar 2022 19:42:28 +0000 Message-Id: <20220308194229.1260292-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 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 ; Tue, 08 Mar 2022 19:42:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95889 There's been a lot of work on this class so clean it up a bit. Rationalise imports, python3-dir is already included in python3native. Don't write a helper script in do_configure, just call the API in do_compile. In the long term this should be using pypa/build instead of calling the API directly. Stub out do_configure as the base configure isn't useful. Write the wheel to PIP_INSTALL_DIST_PATH instead of hard-coding S/dist, and clean it. Use EXPORT_FUNCTIONS on the tasks. Signed-off-by: Ross Burton --- meta-python/classes/poetry_core.bbclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-python/classes/poetry_core.bbclass b/meta-python/classes/poetry_core.bbclass index 4b3f9631e2..fb37c78c78 100644 --- a/meta-python/classes/poetry_core.bbclass +++ b/meta-python/classes/poetry_core.bbclass @@ -1,15 +1,15 @@ -inherit pip_install_wheel python3native python3-dir setuptools3-base +inherit pip_install_wheel python3native setuptools3-base -DEPENDS += "python3 python3-poetry-core-native python3-pip-native" +DEPENDS += "python3-poetry-core-native" -do_configure () { - mkdir -p ${S}/dist - cat > ${S}/build-it.py << EOF -from poetry.core.masonry import api -api.build_wheel('${S}/dist') -EOF +poetry_core_do_configure () { + : } -do_compile () { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${S}/build-it.py +# TODO: ideally this uses pypa/build +poetry_core_do_compile () { + nativepython3 -c "from poetry.core.masonry import api; api.build_wheel('${PIP_INSTALL_DIST_PATH}')" } +do_compile[cleandirs] += "${PIP_INSTALL_DIST_PATH}" + +EXPORT_FUNCTIONS do_configure do_compile From patchwork Tue Mar 8 19:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 4972 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 1044FC433F5 for ; Tue, 8 Mar 2022 19:42:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web09.12747.1646768554683907774 for ; Tue, 08 Mar 2022 11:42:34 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 52BE01655 for ; Tue, 8 Mar 2022 11:42:34 -0800 (PST) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F2DB63FA45 for ; Tue, 8 Mar 2022 11:42:33 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Subject: [PATCH 2/2] python3-poetry-core: self-bootstrap Date: Tue, 8 Mar 2022 19:42:29 +0000 Message-Id: <20220308194229.1260292-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220308194229.1260292-1-ross.burton@arm.com> References: <20220308194229.1260292-1-ross.burton@arm.com> 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 ; Tue, 08 Mar 2022 19:42:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/95890 Poetry can bootstrap itself, so just inherit poetry_core. Signed-off-by: Ross Burton --- .../python/python3-poetry-core_1.0.8.bb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb index 8ac9ed2be3..99ec763c4d 100644 --- a/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb +++ b/meta-python/recipes-devtools/python/python3-poetry-core_1.0.8.bb @@ -21,7 +21,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=104d5c3c653aeededf4076773aa4c236 \ SRC_URI[sha256sum] = "951fc7c1f8d710a94cb49019ee3742125039fc659675912ea614ac2aa405b118" -inherit pip_install_wheel python3native python3-dir pypi setuptools3-base +inherit poetry_core pypi + PIP_INSTALL_PACKAGE = "poetry_core" RDEPENDS:${PN}:append:class-target = "\ @@ -42,16 +43,4 @@ RDEPENDS:${PN} += "\ python3-six \ " -do_configure () { - mkdir -p ${B}/dist - cat > ${B}/build-it.py << EOF -from poetry.core.masonry import api -api.build_wheel('${B}/dist') -EOF -} - -do_compile () { - ${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN} ${B}/build-it.py -} - BBCLASSEXTEND = "native nativesdk"