From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iGczCtBfSGcjCQEAqHPOHw:P1 (envelope-from ) for ; Thu, 28 Nov 2024 12:19:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iGczCtBfSGcjCQEAqHPOHw (envelope-from ) for ; Thu, 28 Nov 2024 13:19:28 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lm8J6ipR; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=iS+CHC94; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732796368; a=rsa-sha256; cv=none; b=WEECR7C95maop+wQJSHnv+6yROHqqJoOuXj3HYm9bP+rta7X0I/lUCXblNl9rBXCkIjvIt mqfEKqBOVS1EtpzVTW33h3UYCNCLOlwbP1cv6R/zDX1MXWvHIhju7i2hBPWqRLPceNKbMP YADm7Zq6lfxj9LNjEx26zp9v4XYITuf/VR7FL9gs8dRAa9T4RCpGiNoOd2duRDr5OLC/qM snkTXSC87v0Fmt2admtrlBGuHwk35N3vd5AnIWe6p+4DkQ3rRnOmV8I7dq5mb5JyebsUNL smPfr43UdZB3pD1ZpHWqADBbmlH1Y2Xt9pTR57QWmyC4R4pAYmfDvdPRYQHteQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lm8J6ipR; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=iS+CHC94; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1732796368; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=LDX10VzT6gHfLqofiMVYGgJNtUmgyazaPo+ZfZpWge4=; b=hwHAzBDvfqT0TZ1tnxe8GHXAHFZFcRN3sxj7shnSQlpbf4P2hWcaQ4TckC1uFhAhxYLjvy YE+JdpkLcUlgUCgefvCgu0mMv6AHwPcyRlsOi4zwH9TiL3h2/R1SycnZPT2AWXIz9ZXUr6 cObscMI9eRfzWX5722jsXERSVKFZYdQ3vCJHZkUjdYRrJFOaQx0kBh3W+uMjV3456CNMcQ 6DhSFMyrYFhJz3skWADvdQtCeB7BLfeKopTYQG6K+h79hzLTFEayeDfYbxwVRdDBn1iPs5 JNkqpVvVPsybk/yzX6K5rxT52OmoctgGKFJxanZqSljSU+AiZXtcYbAYfCioxA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 432C91DBE4 for ; Thu, 28 Nov 2024 13:19:27 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tGdUC-0002Em-Mo; Thu, 28 Nov 2024 07:19:08 -0500 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 1tGdU9-0002EB-Us for guix-patches@gnu.org; Thu, 28 Nov 2024 07:19:06 -0500 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 1tGdU9-0003BN-LY; Thu, 28 Nov 2024 07:19:05 -0500 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=LDX10VzT6gHfLqofiMVYGgJNtUmgyazaPo+ZfZpWge4=; b=lm8J6ipRv2Rdt+E66x0Wv5jT68PU0k3e/3ftUl1/fCwvECr0Cr3r/aJejzE8FIyPqRQU1IwcYKpxlIUH0SqE6nSIVsF3CyJVTpSS+Lqq5Pc/ZM+27DGsafCJDxUn+1zX9n4UWrz/56v/EGPI6sFWagVk5zEDEmJKRv2Ci/2HAcsp+egvIeUBbVGxARxpya1eZ9DaXaUq6/O4qSk50x+ouVvplcUWDCzNhVaB8GDYbzhY74R1TOpP+o9wKx83JmWW9dXryIitRVDLAH3YshOdDOX/aX7EzIl+hYASZYYWthCTiMHlzrRTgo3jj2+d2Q/wI/d8pfbopEzq1WAJDkjEwQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tGdU6-0005zw-Pj; Thu, 28 Nov 2024 07:19:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74582] [PATCH python-team 2/4] build/pyproject: Fix indentation. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Thu, 28 Nov 2024 12:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74582 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74582@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Maxim Cournoyer , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 74582-submit@debbugs.gnu.org id=B74582.173279629622958 (code B ref 74582); Thu, 28 Nov 2024 12:19:02 +0000 Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 12:18:16 +0000 Received: from localhost ([127.0.0.1]:37087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGdTL-0005y8-Fr for submit@debbugs.gnu.org; Thu, 28 Nov 2024 07:18:15 -0500 Received: from mail-pf1-f172.google.com ([209.85.210.172]:43121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tGdTH-0005xU-I2 for 74582@debbugs.gnu.org; Thu, 28 Nov 2024 07:18:12 -0500 Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7251ace8bc0so1386464b3a.0 for <74582@debbugs.gnu.org>; Thu, 28 Nov 2024 04:18:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732796225; x=1733401025; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LDX10VzT6gHfLqofiMVYGgJNtUmgyazaPo+ZfZpWge4=; b=iS+CHC94xIszcIQu/N82pC7hKwGzoMRvr25qVLvr7iiVN04e/JE5GJKL2YxTTZr3x5 obZXRFdpa3FZpwL4X0uyZpJQ3AXb1tLclMftjdDchhRuKazdZ6FR0q4UZ8v6/xRzv1NZ lhwdOecPsiZjAO5tcxUd1dEwOZgS+BpBZ0Z9fz1Oeo1e5v2bs4ieKPrShlKLc+8f6T+Q GYyr/ydJ5yUmXU9cg7bqC8xMpQGepKnKwRFCkLccj+/NrbG2Mq7TF2kmYV0THMzphU0L aRU4a7sCJ06H9NjG3dTM1kye9++Tbtwg+Uv71oxG8/pWOEW2SgfY32MgSIU6sNNCmPUe 635g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732796225; x=1733401025; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LDX10VzT6gHfLqofiMVYGgJNtUmgyazaPo+ZfZpWge4=; b=rIsGpACQRfePMmssF9QCSZOwBvjN4b5JwM5SZ8rUJKSX0EUNIWmfykFq11CvQ004so y8NMWCuJSdWgMozH6ak+Q+6Dj0x7dDlTwbhKy3xgR2Jh4lpk6Yz7GR2LgikI6w5zxQBE HAS5hlIeKQ+wXJLoqF2TOmzIrAxbnf0qWSElHSg6frv3ocC8NlyCgOeXbD8wfE+VDuLK VSXyBZj7dbYCMWIpZtHrP/PK41SWgEiyNnMyKIkFMOJ5IhiGwmYq2WnrNwPLnvcDPPOe B1mfC+wM+calA5pXI7IxkjSA4U8SnZh0xA8W7z+W383Za/eEbYhC0uXtuVfB0eFBMfwV f01A== X-Gm-Message-State: AOJu0Yx/y7PpkuengksWlixJYt7q+sWXJz16BhByzRpAf5TdmVy0uxuC UPYNYkwVeAgeb04ZsXyVvyfy/AkE/l+qED4dIT/FoXduR2JyRG2dXSt4/Q== X-Gm-Gg: ASbGncvBcIc2D3NF+EpYuplO/RPyztrI+F6EcpncZ6Nyn6yBYyBdEwZmRf+KffyNoIF A/lEOjmENfwPT7ZzKTDLaP8TZwDaBQE5b6s5UvhnIY+y9oLVIzvspajhSnUYGc5MNSlchCs1Zcf OQKwMYb/APDWDPiCoR4doDfbGekE3QBPDZF4tAFO14MP4TRiaYDAW8lUr/oMNCJL2HivuUak8cd t2f//2A4R9tebcXuwpTNBHm7U609LwJAyfaYs10gJF63W3KhPSkoGWjs3RRovkcbB3J X-Google-Smtp-Source: AGHT+IHhvzdAmW4CSsh0M+aYYUw1l18uQ/Hj1ZI1wlitGlwyvRy5vTepiMAZ3LAh/3rwxivtKQXXTA== X-Received: by 2002:a17:902:f645:b0:20b:4d50:e4c7 with SMTP id d9443c01a7336-2151d130c42mr59140745ad.0.1732796225366; Thu, 28 Nov 2024 04:17:05 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-215219064bbsm12181475ad.101.2024.11.28.04.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 04:17:04 -0800 (PST) From: Maxim Cournoyer Date: Thu, 28 Nov 2024 21:16:40 +0900 Message-ID: <90f63776c70ab18318067ceaab407f72b5093876.1732781055.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -1.07 X-Spam-Score: -1.07 X-Migadu-Queue-Id: 432C91DBE4 X-Migadu-Scanner: mx12.migadu.com X-TUID: atEbjCv5vrjh * guix/build/pyproject-build-system.scm: Re-indent file with Emacs. Change-Id: I15c89628190b81a71f799e4812c3b6a360f93bcb --- guix/build/pyproject-build-system.scm | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index 03992d915f..d42577b259 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -77,11 +77,11 @@ (define-condition-type &python-build-error &error python-build-error?) ;; Raised when 'check cannot find a valid test system in the inputs. (define-condition-type &test-system-not-found &python-build-error - test-system-not-found?) + test-system-not-found?) ;; Raised when multiple wheels are created by 'build. (define-condition-type &cannot-extract-multiple-wheels &python-build-error - cannot-extract-multiple-wheels?) + cannot-extract-multiple-wheels?) ;; Raised, when no wheel has been built by the build system. (define-condition-type &no-wheels-built &python-build-error no-wheels-built?) @@ -93,8 +93,7 @@ (define* (build #:key outputs build-backend configure-flags #:allow-other-keys) "Look up the build backend in a pyproject.toml file." (call-with-input-file file (lambda (in) - (let loop - ((line (read-line in 'concat))) + (let loop ((line (read-line in 'concat))) (if (eof-object? line) #f (let ((m (string-match "build-backend = [\"'](.+)[\"']" line))) (if m @@ -122,18 +121,18 @@ (define* (build #:key outputs build-backend configure-flags #:allow-other-keys) auto-build-backend "setuptools.build_meta"))) (format #t - "Using '~a' to build wheels, auto-detected '~a', override '~a'.~%" - use-build-backend auto-build-backend build-backend) + "Using '~a' to build wheels, auto-detected '~a', override '~a'.~%" + use-build-backend auto-build-backend build-backend) (mkdir-p wheel-dir) ;; Call the PEP 517 build function, which drops a .whl into wheel-dir. (invoke "python" "-c" - "import sys, importlib, json + "import sys, importlib, json config_settings = json.loads (sys.argv[3]) builder = importlib.import_module(sys.argv[1]) builder.build_wheel(sys.argv[2], config_settings=config_settings)" - use-build-backend - wheel-dir - config-settings))) + use-build-backend + wheel-dir + config-settings))) (define* (check #:key tests? test-backend test-flags #:allow-other-keys) "Run the test suite of a given Python package." @@ -253,19 +252,20 @@ (define* (install #:key inputs outputs #:allow-other-keys) (scandir wheel-dir (cut string-suffix? ".whl" <>))))) (cond - ((> (length wheels) 1) - ;; This code does not support multiple wheels yet, because their - ;; outputs would have to be merged properly. - (raise (condition (&cannot-extract-multiple-wheels)))) - ((= (length wheels) 0) - (raise (condition (&no-wheels-built))))) + ((> (length wheels) 1) + ;; This code does not support multiple wheels yet, because their + ;; outputs would have to be merged properly. + (raise (condition (&cannot-extract-multiple-wheels)))) + ((= (length wheels) 0) + (raise (condition (&no-wheels-built))))) (for-each extract wheels)) (let ((datadirs (map (cut string-append site-dir "/" <>) (list-directories site-dir (file-name-predicate "\\.data$"))))) (for-each (lambda (directory) (expand-data-directory directory) - (rmdir directory)) datadirs)))) + (rmdir directory)) + datadirs)))) (define* (compile-bytecode #:key inputs outputs #:allow-other-keys) "Compile installed byte-code in site-packages." @@ -341,7 +341,7 @@ (define* (create-entrypoints #:key inputs outputs #:allow-other-keys) import sys import ~a as mod sys.exit (mod.~a ())~%" interpreter module function))) - (chmod file-path #o755))) + (chmod file-path #o755))) (let* ((site-dir (site-packages inputs outputs)) (out (assoc-ref outputs "out")) -- 2.46.0