From patchwork Sat Oct 22 22:20:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43873 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 73CB327BBEA; Mon, 24 Oct 2022 03:17:55 +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=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 202F927BBE9 for ; Mon, 24 Oct 2022 03:17:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjtp-0001s7-MD for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:56:57 -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 1omMtV-0004mK-3G for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:06 -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 1omMtU-00061P-SV for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omMtU-00024X-NA for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH v3 11/22] gnu: python-statmake: Use pyproject-build-system. Resent-From: Marius Bakke Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Oct 2022 22:23:04 +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.16664773457794 (code B ref 58587); Sat, 22 Oct 2022 22:23:04 +0000 Received: (at 58587) by debbugs.gnu.org; 22 Oct 2022 22:22:25 +0000 Received: from localhost ([127.0.0.1]:42597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMsr-00021Y-3a for submit@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:40682) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMse-0001zr-3D for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:13 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omMsL-0005Mw-5p for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:06 -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=DbeOCj0ud678a5K5D0Ac aJRtiosuiGBBq72qOZO847q4n680q4RljLrdDlzTcGiIaxSAt26V3BjICQjFqEecx96Sdk+VnCy+G dJcSWB3juyJKeurOkJqIUa1TqlNa1XToB8Cs/6ONr27P349E5uhMqMA+koOAt5bYGnFPcaKWhmAqb rDc1MqFvW602UGvUhQPVKEihge/FC8eFGeKChtrm8V5KCqogOjqrpSPvwv7IxHRymGYJC4jqHMqi3 cJYPEkCAZamk4xx87fD3XR/5l8L/9uxEZyIJV3nT+UykN6s2L+HB2xG/fz00euM5EvH3zQwxu/KoV Q2u7azIh/KwFtg==; Received: from [84.214.173.6] (helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1omMsG-0001Rl-7q for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:21:52 -0400 From: Marius Bakke Date: Sun, 23 Oct 2022 00:20:49 +0200 Message-Id: <20221022222100.18103-11-marius@gnu.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221022222100.18103-1-marius@gnu.org> References: <87eduzu18u.fsf@gnu.org> <20221022222100.18103-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