From patchwork Mon Oct 17 20:11:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marius Bakke X-Patchwork-Id: 43480 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 208D027BBEA; Mon, 17 Oct 2022 21:15:27 +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 CBC8627BBE9 for ; Mon, 17 Oct 2022 21:15:26 +0100 (BST) Received: from localhost ([::1]:50382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1okWWD-0008U0-O7 for patchwork@mira.cbaines.net; Mon, 17 Oct 2022 16:15:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWTx-0006uv-Qo for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51102) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1okWTx-0002HK-Gt for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1okWTx-0007PC-BZ for guix-patches@gnu.org; Mon, 17 Oct 2022 16:13:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH 05/14] gnu: python-autopage: 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:05 +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.166603754528237 (code B ref 58587); Mon, 17 Oct 2022 20:13:05 +0000 Received: (at 58587) by debbugs.gnu.org; 17 Oct 2022 20:12:25 +0000 Received: from localhost ([127.0.0.1]:50133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTI-0007LF-Ga for submit@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39138) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1okWTB-0007K4-RQ for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:22 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51498) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWT6-0002D6-L1 for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:12 -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=gfFD4wcD/C/wzOY4zXb2DoVNnC85oTohumUymid0//0=; b=J7yvHLrWvhpm8ZgYmzNb icMgO+Ay4oFrB8L1zvu3ZTw32hVS9nuWIVP1jnIB6qdYW6/UmQBMMjEEErcoXT8UGC+fqvPthZb5c lwtrwGXnMdWXQiGHW8t8DkxIc+7ZtLVKoM6y//hWYkijJivhP2fePCEjMtgclTrE9u6O0FGozrBVM Z66suY1P5O66IcBCEVJGjREmP0nFXU/2mx9HSYVa47thvJt2sAdcTUQsUb7eg675ScR4crIRSfO4+ rUlFRlJ5sjnN+ubzA3ObFoEBwiFcVJvY/p1zVXf0mdsfl9UOGSLinQXnRKWHshAvjTAz8x0KNmegx YuFQ7monasFL2g==; Received: from [84.211.203.64] (port=33082 helo=localhost) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1okWT6-00050D-21 for 58587@debbugs.gnu.org; Mon, 17 Oct 2022 16:12:12 -0400 From: Marius Bakke Date: Mon, 17 Oct 2022 22:11:52 +0200 Message-Id: <20221017201201.4808-5-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/python-xyz.scm (python-autopage)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove redundant phases. --- gnu/packages/python-xyz.scm | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1ded6f0384..42935cbaaa 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -259,6 +259,7 @@ (define-module (gnu packages python-xyz) #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1) @@ -6959,33 +6960,16 @@ (define-public python-autopage (sha256 (base32 "169ixll1ncm2a2pcc86665ikjv2lrzs10p6c1w4yj55p3gk3xgh1")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases - ;; Do a manual PEP 517 style build/install procedure until the - ;; python-build-system overhaul is merged. - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (let ((circa-1980 (* 10 366 24 60 60))) - (setenv "SOURCE_DATE_EPOCH" (number->string circa-1980)) - (invoke "python" "-m" "build" "--wheel" "--no-isolation" ".")))) (add-before 'check 'disable-e2e-tests (lambda _ ;; These tests rely on KeyboardInterrupts which do not ;; work in the build container. - (delete-file "autopage/tests/test_end_to_end.py"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv")))) - (replace 'install - (lambda _ - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) + (delete-file "autopage/tests/test_end_to_end.py")))))) (native-inputs (list python-pypa-build python-setuptools