From patchwork Mon Oct 17 20:11:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43484 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 A6FAB27BBEA; Mon, 17 Oct 2022 21:15:31 +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,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 858D327BBED for ; Mon, 17 Oct 2022 21:15:30 +0100 (BST) Received: from localhost ([::1]:37468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okWWH-0000NS-IP for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 16:15:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWU0-00070b-De for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51108) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okWU0-0002IK-64 for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okWU0-0007Pu-1H for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH 10/14] gnu: python-statmake: Use pyproject-build-system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 17 Oct 2022 20:13:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58587 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58587@debbugs.gnu.org Received: via spool by 58587-submit@debbugs.gnu.org id=B58587.166603755728324 (code B ref 58587); Mon, 17 Oct 2022 20:13:07 +0000 Received: (at 58587) by debbugs.gnu.org; 17 Oct 2022 20:12:37 +0000 Received: from localhost ([127.0.0.1]:50154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTU-0007Mg-Ra for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:37 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTL-0007Kb-5b for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:27 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTG-0002E9-0Z for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=ceZVkUQjSuYrrM7iupoIDNK7vaP2D8CZPUZV8SYltmA=; b=N6aUtRsOB4xzluADF0a+ tkVMOKl3IAOqK6vUqOdzGUHYGExsFqlYBu5kVCY6qd7pct+dro6emiSbT2k7JixlB7+rwDwuKtUD3 PpEanzxkN+uUbALUzuobCn13iB7zDwvd3V5yrlJ6PflC0cE7QKScM7iPNDtu44SEC9x35BbMs+/Y4 jzNKKXna7OsoSHa7Q29f3PydYRLP8PSPswFQYYRyJb/mP+ojZfKm//zy2RiWwU6MPisUgC17HssR8 ZUl63XAZRC4XjhpndBgtCONoRcGzcpwkrRlprwDQSUNLIPzMKrxSsTF09VPg1C24xYXH3GodBoPq0 xYWMBCK1CtIUlA==; Received: from [84.211.203.64] (port=52326 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTF-00051C-9h for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:21 -0400 From: Marius Bakke Date: Mon, 17 Oct 2022 22:11:57 +0200 Message-Id: <20221017201201.4808-10-marius@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221017201201.4808-1-marius@gnu.org> References: <20221017200624.4076-1-marius@gnu.org> <20221017201201.4808-1-marius@gnu.org> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fontutils.scm (python-statmake)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove redundant phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. --- gnu/packages/fontutils.scm | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index eefde1d893..5c95f9a427 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1561,12 +1561,11 @@ (define-public python-statmake (sha256 (base32 "0qavzspxhwnaayj5mxq6ncjjziggabxj157ls04h2rdrpq167706")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - ;; XXX: PEP 517 manual build copied from python-isort. (add-after 'unpack 'adjust-for-older-attrs ;; Our older attrs package is using the 'attr' rather than 'attrs' ;; namespace. @@ -1583,27 +1582,9 @@ (define-public python-statmake (("@attrs") "@attr") (("\\battrs\\.") - "attr.")))) - (replace 'build - (lambda _ - (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 whl)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "tests" - ;;"-n" (number->string (parallel-job-count)) - ;; This test requires orjson, which needs the maturin - ;; build system and new Rust dependencies. - ;;"--ignore" "tests/test_preconf.py" - ))))))) + "attr."))))))) (native-inputs (list python-poetry-core - python-pypa-build python-pytest python-ufo2ft)) (propagated-inputs