From patchwork Sun Apr 6 12:37:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 41360 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 3799827BBEA; Sun, 6 Apr 2025 13:39:53 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B28AC27BBE2 for ; Sun, 6 Apr 2025 13:39:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u1PHz-0006ma-5E; Sun, 06 Apr 2025 08:39:51 -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 1u1PHJ-0006Mw-Ug for guix-patches@gnu.org; Sun, 06 Apr 2025 08:39:13 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u1PHD-0005SM-Sh for guix-patches@gnu.org; Sun, 06 Apr 2025 08:39:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=WKKa5JbLuViTlQnibLjMAen9FGpLRwtMfku9+A3h2J0=; b=BLgPnoxuWVzWENcte9W7LhXW06n+56mR7aWh7ElhQuffJyiK6tvx9ainWUsCEZDhMEg7iJR0Y60G6qI8X4DqEf/Kz0s7PSi9I+ikL2WzWJKtizZv0N8nfcjQ8heD4gKXhio6QrYA8o1l3g6V9j93zgLRPz6GjAZJcVhC7MOGAu/5GiQapGZcnwmTk/2CbaFipF49u809XeUDJSSkjgAA3kwpVlzjXOLbG0B6P90eJUOPDx0OXSUP2W0RDI1UBw3QAo28As9RoCpx4tzWjt1vSDSTyutgQIonHcZZXXCKo0jaZg7TeYaSj+tCGcm9GulwuU0jMeXvYEENYIp/psfp0A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u1PHD-0001YY-Ms; Sun, 06 Apr 2025 08:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77575] [PATCH 19/21] gnu: bpytop: Switch to pyproject-build-system. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Sun, 06 Apr 2025 12:39:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77575 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77575@debbugs.gnu.org Cc: Nicolas Graves , lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org X-Debbugs-Original-Xcc: lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org Received: via spool by 77575-submit@debbugs.gnu.org id=B77575.17439430925870 (code B ref 77575); Sun, 06 Apr 2025 12:39:03 +0000 Received: (at 77575) by debbugs.gnu.org; 6 Apr 2025 12:38:12 +0000 Received: from localhost ([127.0.0.1]:46473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u1PGO-0001WX-33 for submit@debbugs.gnu.org; Sun, 06 Apr 2025 08:38:12 -0400 Received: from 4.mo562.mail-out.ovh.net ([46.105.38.146]:39171) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u1PG9-0001Rt-F0 for 77575@debbugs.gnu.org; Sun, 06 Apr 2025 08:37:58 -0400 Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net [51.68.80.175]) by mo562.mail-out.ovh.net (Postfix) with ESMTPS id 4ZVsLr3rDyz1KNY; Sun, 6 Apr 2025 12:37:56 +0000 (UTC) Received: from director1.derp.mail-out.ovh.net (director1.derp.mail-out.ovh.net. [127.0.0.1]) by director1.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP for <77575@debbugs.gnu.org>; Sun, 6 Apr 2025 12:37:56 +0000 (UTC) Received: from mta7.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.108.17.166]) by director1.derp.mail-out.ovh.net (Postfix) with ESMTPS id 4ZVsLr29qkzHcF5; Sun, 6 Apr 2025 12:37:56 +0000 (UTC) Received: from ngraves.fr (unknown [10.1.6.0]) by mta7.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id CC2A4C397D; Sun, 6 Apr 2025 12:37:55 +0000 (UTC) Authentication-Results: garm.ovh; auth=pass (GARM-100R003aa95d3f2-02b8-47a4-9a68-f534b029f162, C919729AFBE9AB1136EE71DE75FB1B1DBE8A85BF) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Sun, 6 Apr 2025 14:37:21 +0200 Message-ID: <20250406123732.31301-19-ngraves@ngraves.fr> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250406123732.31301-1-ngraves@ngraves.fr> References: <20250406123732.31301-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8476900402315059938 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduleejvdelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdehleeiffehtedvlefhffffjeefgfduhfetkeevheeiteduiedugfekuedtheejnecuffhomhgrihhnpehgihhthhhusgdrtghomhenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeejheejheesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpoffvtefjohhsthepmhhoheeivdgmpdhmohguvgepshhmthhpohhuth DKIM-Signature: a=rsa-sha256; bh=WKKa5JbLuViTlQnibLjMAen9FGpLRwtMfku9+A3h2J0=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1743943076; v=1; b=hTmupLuwYkiS0sAdKw43xDpxPAWRittRgSJii5HUs0K/6sqg1g3jO3JA28d3iDL3zBW8Sqrt DNoPS+G8OnDGE7l2ju3FW27pNM5YJtRxzSCOI+JqO6abS4kP68NNS3W7deVeQlJUri1LPwK89EH bkIgNUZC7Cn21BSje+JoQjNZBUvevqWI1FIOg5lfNg/dq0BnGIqPfKFVpZFopa0mljxLQV0CMDn X/OG7+57V/k3V6G6WjgtsW/4PgDEX4qGKrJsJiD1cBSgrYBVqLryMSWq69JJA0HAiYSFOM+lnz1 AgJyWfolPAnc/R42uxMH0zEPcbTqZcTGhU2484ZQyYcyg== 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: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves 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/admin.scm (bpytop) [build-system]: Swith to pyproject. [arguments]{tests?}: Disable tests. {phases}: Add phase 'use-poetry-core. Improve phase 'install-theme. [native-inputs]: Add python-poetry-core. --- gnu/packages/admin.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 9aa71f8cf9..ce34477749 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1065,25 +1065,29 @@ (define-public bpytop (uri (pypi-uri "bpytop" version)) (sha256 (base32 "1clvajbv7pzlya9s1xs6dvjic8rv3kx7aqiwnjxapiypx246gdjk")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ; No tests in Pypi archive. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) + (add-after 'install 'install-themes + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((themes (string-append (site-packages inputs outputs) + "/bpytop-themes"))) + (mkdir-p themes) + (copy-recursively "themes" themes))))))) (inputs (list python-psutil)) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; sanity-check phase fail, but the application seems to be working - (delete 'sanity-check) - (add-after 'install 'install-themes - (lambda* (#:key outputs #:allow-other-keys) - (let ((themes (string-append (assoc-ref outputs "out") - "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages/bpytop-themes"))) - (mkdir-p themes) - (copy-recursively "themes" themes))))))) - (home-page - "https://github.com/aristocratos/bpytop") + (native-inputs + (list python-poetry-core)) + (home-page "https://github.com/aristocratos/bpytop") (synopsis "Resource monitor") (description "Resource monitor that shows usage and stats for processor, memory, disks, network and processes. It's a Python port and continuation of