From patchwork Fri Apr 28 05:51:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 49628 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ABF5227BBEA; Fri, 28 Apr 2023 06:52:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2563E27BBE2 for ; Fri, 28 Apr 2023 06:52:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1psH1c-00063W-Tz; Fri, 28 Apr 2023 01:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1psH1Z-0005yw-1F for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1psH1Y-0003Hx-NW for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1psH1Y-0006f2-JS for guix-patches@gnu.org; Fri, 28 Apr 2023 01:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63139] [PATCH python 14/20] gnu: Update python-pypa-build to 1.0.0. Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 28 Apr 2023 05:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63139 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63139@debbugs.gnu.org Cc: John Kehayias Received: via spool by 63139-submit@debbugs.gnu.org id=B63139.168266111825553 (code B ref 63139); Fri, 28 Apr 2023 05:52:04 +0000 Received: (at 63139) by debbugs.gnu.org; 28 Apr 2023 05:51:58 +0000 Received: from localhost ([127.0.0.1]:60317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH1S-0006e5-9W for submit@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:58 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:30395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1psH1Q-0006dq-OL for 63139@debbugs.gnu.org; Fri, 28 Apr 2023 01:51:57 -0400 Date: Fri, 28 Apr 2023 05:51:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1682661111; x=1682920311; bh=ki0/VkoDVIIUvrB5kTyalcVKZtmChk5JRtWwOqIHt7I=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=OIAiMMgvWKH550MUGY61VW9Md1RMv69XnkA4mwDucYNi1wFzQR5sXJ26RFJjAuzGh kj5rIRciHnmLeg35LMgNcrXrM9Q+ULxzACFqYpHK+685jFPMVFGC9egO/Z9fO4x1aY MZcNucXvOLTeG0MQSdqirzW8gU3dsnDtmDcc8rQRZcYbBPdDQ4sprJHv/rbvBzKIqL 8WdSqyuiMM5yl3QIyXaway7on54lU7zKjdyynRs+S5BKSgVw4VSAxz0HG38TCnVDib CMKsCy4ReWs2wXv5BaeE+FUIB1FXqf55a750tKa8BQczY3mgUlo8qffWDaHuUlm786 K8COOYPTId7aA== Message-ID: <6bc32c704fccaab100a9f1d67e5b734dfb61b630.1682660105.git.john.kehayias@protonmail.com> In-Reply-To: References: Feedback-ID: 7805494:user:proton MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-build.scm (python-pypa-build): Rename to... (python-pypa-build-bootstrap): ... this. (python-pypa-build): Update to 1.0.0. --- gnu/packages/python-build.scm | 39 +++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) -- 2.39.2 diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 45b9f52b68..090f0d2274 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -502,9 +502,9 @@ (define-public python-packaging-bootstrap ;;; The name 'python-pypa-build' is chosen rather than 'python-build' to avoid ;;; a name clash with python-build from (guix build-system python). -(define-public python-pypa-build +(define-public python-pypa-build-bootstrap (package - (name "python-pypa-build") + (name "python-pypa-build-bootstrap") (version "0.7.0") (source (origin (method url-fetch) @@ -534,6 +534,41 @@ (define-public python-pypa-build order to make bootstrapping easier.") (license license:expat))) +(define-public python-pypa-build + (package + (inherit python-pypa-build-bootstrap) + (name "python-pypa-build") + (version "0.10.0") + (source (origin + (method url-fetch) + (uri (pypi-uri "build" version)) + (sha256 + (base32 + "0scj5k586n8rmnlqhay5j43ci1z8ip3sm0j4f3b52nfvmxj15dym")))) + (arguments + (list + #:tests? #f ; avoid needing pytest as an input + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-toml-instead-of-tomli + ;; Using toml instead of tomli eases bootstrapping. + (lambda _ + (substitute* "pyproject.toml" + (("'tomli.*") + "'toml'")))) + (replace 'build + (lambda _ + ;(setenv "PYTHONPATH" ".") + (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) + (replace 'install + (lambda _ + (let ((whl (car (find-files "dist" "\\.whl$")))) + (invoke "pip" "--no-cache-dir" "--no-input" + "install" "--no-deps" "--prefix" #$output + "--ignore-installed" whl))))))) + (native-inputs (list python-flit-core-bootstrap python-pypa-build-bootstrap)) + (propagated-inputs (list python-pyproject-hooks)))) + (define-public python-poetry-core (package (name "python-poetry-core")