From patchwork Sat Oct 22 22:20: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: 43829 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 F1D0A27BBEA; Mon, 24 Oct 2022 01:32:28 +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 0CEF027BBE9 for ; Mon, 24 Oct 2022 01:32:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1omjuQ-00022r-7t for patchwork@mira.cbaines.net; Sun, 23 Oct 2022 18:57:34 -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 1omMtW-0004mM-Fo 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 1omMtW-00061d-96 for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1omMtV-00024t-VZ for guix-patches@gnu.org; Sat, 22 Oct 2022 18:23:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58587] [PATCH v3 19/22] gnu: python-path: 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: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.16664773707878 (code B ref 58587); Sat, 22 Oct 2022 22:23:05 +0000 Received: (at 58587) by debbugs.gnu.org; 22 Oct 2022 22:22:50 +0000 Received: from localhost ([127.0.0.1]:42615 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMtG-00022u-Dd for submit@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54064) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1omMt0-00021r-C9 for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:34 -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 1omMsu-0005xq-6v for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:29 -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=ugtHkPMJnvHz4KtofKeJaYV1q2f3vogpmpFCaTmbtLs=; b=q4MT7vIpsSx6AJEYb4B5 Kr0KpAA2gvIP6FplLONvlVmbp6VzlukHKuIFRxDYOqsaTSY4b2BLNeeEvFIpxjmXUZ3/cMC2fggzj Nn/Ize3xeEY1PhymElGYC0NvXlyLOYzuETz/L3N8+yWYGR8wmWHcG2jpKYYBLfl3a9Vr7kt4bvWHA hmGn0aNs7Yd4jF19qM005befsd3cu6E8Jr18KmH9QbWV/gdyrbwYgDexX2rJTJ0Zc3cm7bhVlfA09 +alUsdqx8bU+e5kjn5F1DUBAtub7VmWHkIjcTxKnG070iDrtu67WNzaxODUvYQ4giNn75LY/QjJRM o8X3CyfWu0Uc0A==; 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 1omMst-0001Uz-P1 for 58587@debbugs.gnu.org; Sat, 22 Oct 2022 18:22:27 -0400 From: Marius Bakke Date: Sun, 23 Oct 2022 00:20:57 +0200 Message-Id: <20221022222100.18103-19-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/python-xyz.scm (python-path-bootstrap)[build-system]: Switch to PYPROJECT-BUILD-SYSTEM. [arguments]: Remove #:phases. [native-inputs]: Remove PYTHON-PYPA-BUILD. (python-path): Remove #:phases. Add #:test-flags. --- gnu/packages/python-xyz.scm | 42 +++++++++++-------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f4113ca351..72a516e6fb 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -12548,25 +12548,10 @@ (define-public python-path-bootstrap (uri (pypi-uri "path" version)) (sha256 (base32 "0lig13gxnfv98v790db1smvsbd3mnj7y8rwyiwhfi6xiqibygwms")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - ;; XXX: PEP 517 manual build/install procedures copied from - ;; python-isort. - (replace 'build - (lambda _ - ;; ZIP does not support timestamps before 1980. - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" "-m" "build" "--wheel" "--no-isolation" "."))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((whl (car (find-files "dist" "\\.whl$")))) - (invoke "pip" "--no-cache-dir" "--no-input" - "install" "--no-deps" "--prefix" #$output whl))))))) - (native-inputs (list python-pypa-build python-setuptools-scm)) + (list #:tests? #f)) + (native-inputs (list python-setuptools-scm)) (home-page "https://github.com/jaraco/path") (synopsis "Object-oriented file system path manipulation library") (description "@code{path} (formerly @code{path.py}) implements path @@ -12582,18 +12567,15 @@ (define-public python-path (package-arguments python-path-bootstrap) ((#:tests? _ #f) (not (%current-target-system))) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Do not test the myproject.toml build as it tries to pull - ;; dependencies from the Internet. - (invoke "pytest" "-vv" "-k" - (string-append - "not project " - ;; This tests assumes a root user exists. - "and not test_get_owner"))))))))) + ((#:test-flags flags #~'()) + #~(append (list "-vv" "-k" + (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the Internet. + "not project " + ;; This tests assumes a root user exists. + "and not test_get_owner")) + #$flags)))) (native-inputs (modify-inputs (package-native-inputs python-path-bootstrap) (append python-appdirs