Received: (at 74582) by debbugs.gnu.org; 18 Dec 2024 11:49:33 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Wed Dec 18 06:49:33 2024 Received: from localhost ([127.0.0.1]:33752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tNsYW-0006wh-Mo for submit <at> debbugs.gnu.org; Wed, 18 Dec 2024 06:49:32 -0500 Received: from mail-pf1-f177.google.com ([209.85.210.177]:42115) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tNsYT-0006wW-Gl for 74582 <at> debbugs.gnu.org; Wed, 18 Dec 2024 06:49:30 -0500 Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-728e78c4d7bso511704b3a.0 for <74582 <at> debbugs.gnu.org>; Wed, 18 Dec 2024 03:49:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734522509; x=1735127309; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=NeroxyIdUWQuwImhReqsm0Hkif4YMrSXsQo+lTN8yeQ=; b=LS+v1SyDM9sCYgpCwMACwxty1zaJJYQ4m4hw8jNaOXYNiIdgwgTKAmKWWsdVB3REUz BT17pAmf+SjphWZ6HeflD3L2TvjtVSAkjMUC1pPS+hpCW6J3pNcoT807YNs7kkUFR2re m6xgpOx4US+2J2rT8IxzhibM6YjsvG2ftSlStB9lgnLXqWlprai/C5v2kQlcEgpBfiwY m9Cct3+EvbH0u0IPYDYZa4cn0u2p5CqxATfPYzhdSsDflpUqBg3LLJKA675A/nlxd3Ao s8x6UJE4MKJ/E8MV4Z16AZWHVnpJAAfIqNg8j8U0TeIx6mkTIxmP+pgyS3YJ2+zXvrSM VlWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734522509; x=1735127309; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=NeroxyIdUWQuwImhReqsm0Hkif4YMrSXsQo+lTN8yeQ=; b=TVy3rmdXr1YhSfiGzXlruCTWCEzNP2ndp2epNyMYGbSq1/wF7GRf4cP5oPbLjiLdKX wspHJ+QcSywb81mPA19SMiYzYSYjlEAFiiL2KNMZPZNxmdHBsZRmxQ/4vSY1A5ySr1Pu EBzc1k9aHTNs9PJu5nM3pGBrxZwIzxJuMEx2elxQTUjZMUCRoFpRpbqVzxku3tmzig8e 8l7a/YYNdoSLAZAAvdibcIZsH7c5qdTjzPUp+b2H1U1G4Y5O0pf2RVT3vS85xmAohyCv ELkuN3ZJPyvGEPaxPQ+8Um4cb5Gq14DmgzTiCz6WGUuM+iZCWte/ivzqpzIU/ipw0FQZ 59SQ== X-Forwarded-Encrypted: i=1; AJvYcCXirZbJKE2+bBCr8diNcLd+jZNBXpRhg3JoXGokmWS4TGagwa5A42kxtXfCQJ67MfV9/p7uYQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yz2CknRiVlPdhpluThF2SAZPAINVf8JXdqQZR+nZhuV8DwKml2B TcGHm9feXEK7jyjemT0Or/wuiJ92vFmL3JCVDgglTqxl89CFvfOD X-Gm-Gg: ASbGncsLEQ+H+bpK9zOZxFlhRl55707Ksi3Sw/6SE1ut9yUYFsbWyop3az1Yr3Y9lEi mu/LV4qALdkXvp9ewsqgqLWdbRvOCVSImkBdlGgmJKWMTHtvbR4xziWDmZ/QzMrKNOJ9+CrNNIr lxYnO5LVfuFLZwpDrb5e6F0dufeq+V7+A8Q+D9AnjKt7GdEkThLoBa1KqbdwsUGN05AR2tXez8I BpHPJcmUHf4nS0WBWU80n8u6OvEof40/zyUkZDtNfhSLqLx5ST1Jw== X-Google-Smtp-Source: AGHT+IEVe/8kILE+p+4e5kTAjX+Qszh1R36mbisgRprqf1cZI8lJuxctQTDgPQyQRJo63JDAX4vDgQ== X-Received: by 2002:a05:6a21:3997:b0:1d9:a94:feec with SMTP id adf61e73a8af0-1e5b56b1388mr4251010637.2.1734522508796; Wed, 18 Dec 2024 03:48:28 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72918b7ba8asm8312839b3a.95.2024.12.18.03.48.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 03:48:28 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Lars-Dominik Braun <lars@HIDDEN> Subject: Re: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really merge directories in install phase. In-Reply-To: <87ikrkumsn.fsf@HIDDEN> (Maxim Cournoyer's message of "Mon, 16 Dec 2024 16:09:12 +0900") References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN> <Z0lsD5JDyxEAGlEr@HIDDEN> <87v7vm1eo5.fsf@HIDDEN> <Z18C-R2WaWqy9vSQ@HIDDEN> <87ikrkumsn.fsf@HIDDEN> Date: Wed, 18 Dec 2024 20:48:18 +0900 Message-ID: <87ttb1nrel.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74582 Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, 74582 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hello, Maxim Cournoyer <maxim.cournoyer@HIDDEN> writes: [...] > The odd case I had encountered where merging directories was failing was > an attempt to build a scikit package (I think it was python-libcst) Correction: it was python-pyre, see: bug#74581 for a package definition reproducing it. -- Thanks, Maxim
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at 74582) by debbugs.gnu.org; 16 Dec 2024 07:10:37 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon Dec 16 02:10:37 2024 Received: from localhost ([127.0.0.1]:53282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tN5FU-0007Cm-JI for submit <at> debbugs.gnu.org; Mon, 16 Dec 2024 02:10:36 -0500 Received: from mail-pf1-f172.google.com ([209.85.210.172]:60716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tN5FN-0007CA-O9 for 74582 <at> debbugs.gnu.org; Mon, 16 Dec 2024 02:10:35 -0500 Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-72909c459c4so2181843b3a.1 for <74582 <at> debbugs.gnu.org>; Sun, 15 Dec 2024 23:10:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734332964; x=1734937764; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=buIAQ2cCiEg7GjQue1JIaQkqCr2Hv4ypKCUumYxsY4M=; b=VTua2oebBQ/uinXW/OJGcxfwdzW6JATr+5PqvFle9dd5Zx8zvVjlMUDbieIpVOS/x7 +igObztZAXbZoKZZ+h1dsgkjhTPin2opQbUhX2kYB3giKLOJebucD8UxlhwmrXwnGvDt svKrWtfLvjXv+c1wlKXD5EquZFPCK/Ie1OEx/W4ZIcNtWS4YKCrQDybGv+cf/nDPICvX kDqENv4itLtNa46c5ZNwv1zQBxQRNMzl7MDyVDl1UH9TKOphN1ALLzASq/OX4MVIQtHY 2mr8EMSGxFVIFJhKP+UVzYGPwQ9HbE4mVHHqg3rWVZpPWCoDtWRYKddE8SFDFhOTl/81 jh0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734332964; x=1734937764; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=buIAQ2cCiEg7GjQue1JIaQkqCr2Hv4ypKCUumYxsY4M=; b=AFMWouFRkpcrpD92E9MQbscLeuhe6wyafUzsj/pOIpXhyRCiwMguUDhSOq0cZXcWN/ l6NdYqiOdz03Kn7yPjjuwnSnc/QNW+Y7xWYjigm8aVaAiLAA1Y7LM3N04Ok5edlBH7HZ 7lcDXl+WWIe3O2jj02ROor1dFDAfgDMHafkbEAwA7lUjE0pULFwEZ9YWhx7W7u3EPLGA DJo1IbIdk00giAueavbk0Vr2LlpciQr9koXC8uck2HeYUUai5m7MOI68t5/W6Q0o52GJ 9OdH2Wlq9YCKOZVYcmYpCmq5CfNqeBlOYThfwdcQ4nDOlLxQxVoHTWUl0SaZsLs0GKPM DayA== X-Gm-Message-State: AOJu0YxY4Ch0ZeqKBZG4qSbRVjYfyPPiKFAI96WzhPsk44UeFy7RbdzS dkK8cE9uEs8+Lgr3ZtTu0t7WBldfn5iDLcjYTfHNOgUviOqdpgY0 X-Gm-Gg: ASbGncuEPvibpYP+Zn6arwmoQEvteSiuRKRZs1o3jGrXEjqN41qB/W+Xay1IZPF3IOc iwJYn0nt6qt/wytcM8BHcrjSg7vGvU+sa/TuVC3tASl6WgoJ1D93cWrbDCmb6syg9rtlvQJFRU+ kSvIgD7+S8gD+ffNk6du6s8DkgU7pwuppq/UQ9I32fEIzMIO1ajaoRnQJRLOW/s1IrjQkyv0dv+ M3vHvmnCOxz8kM+ZxTv3zlLWaINEn27RemOdrPvx3Mt96RJNwR0cA== X-Google-Smtp-Source: AGHT+IE8QoxJuzfMHy2dK3Ul7JOZHbE9I7ejOlXph5E3+Qzl9Y2ety/gHssneNCs9oFVnkNntpqGnA== X-Received: by 2002:a05:6a20:1589:b0:1e1:a671:7122 with SMTP id adf61e73a8af0-1e1dfd1f2dfmr16525681637.2.1734332963681; Sun, 15 Dec 2024 23:09:23 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-801d5c0fe68sm3492378a12.62.2024.12.15.23.09.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Dec 2024 23:09:23 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Lars-Dominik Braun <lars@HIDDEN> Subject: Re: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really merge directories in install phase. In-Reply-To: <Z18C-R2WaWqy9vSQ@HIDDEN> (Lars-Dominik Braun's message of "Sun, 15 Dec 2024 17:25:29 +0100") References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN> <Z0lsD5JDyxEAGlEr@HIDDEN> <87v7vm1eo5.fsf@HIDDEN> <Z18C-R2WaWqy9vSQ@HIDDEN> Date: Mon, 16 Dec 2024 16:09:12 +0900 Message-ID: <87ikrkumsn.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74582 Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, 74582 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Lars-Dominik Braun <lars@HIDDEN> writes: > Hi, > >> Yes, that could be nicer. I'd like to keep it for a distinct commti >> though, to keep this small and focus. > > sure, fine. > >> Perhaps, though we'd want to verify that it indeed now works, and not >> having seen that error once, I'm not too sure how to test it. Do you >> know of a package that could make use of this? > > Hm, I checked and it does not seem to be possible to build more than > one wheel with a single pyproject.toml[1]. Let=E2=80=99s keep the code as= is then. Yes. I'd expect perhaps some kind of mono-repo holding multiple Python packages could perhaps end up in such a situation where it'd have mulitple .whl installed to the same prefix. The odd case I had encountered where merging directories was failing was an attempt to build a scikit package (I think it was python-libcst) that used CMake for the extensions, installed that already, then did a regular PEP 517 build and attempted to install more things to its prefix, which already had things placed there by scikit/cmake, IIUC. I ended up packaging libcst via cargo instead of scikit, since it's authored in Rust. --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.
Received: (at 74582) by debbugs.gnu.org; 15 Dec 2024 16:25:42 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Dec 15 11:25:42 2024
Received: from localhost ([127.0.0.1]:51712 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tMrR6-0006Oe-Rc
for submit <at> debbugs.gnu.org; Sun, 15 Dec 2024 11:25:41 -0500
Received: from mout-p-201.mailbox.org ([80.241.56.171]:48050)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <lars@HIDDEN>) id 1tMrR5-0006OL-Gn
for 74582 <at> debbugs.gnu.org; Sun, 15 Dec 2024 11:25:39 -0500
Received: from smtp102.mailbox.org (smtp102.mailbox.org
[IPv6:2001:67c:2050:b231:465::102])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4YB7j75d5sz9slX;
Sun, 15 Dec 2024 17:25:31 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001;
t=1734279931;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding:
in-reply-to:in-reply-to:references:references;
bh=F5+RDnUVS7HJZea7or7HG/5SeBzUm2KMSV2zPMdYKJA=;
b=U9EQEE8VzWr7iPkH/5GEzPVzMNe556fQ0ZRLW/4tKqVRHouKpBDmp4s7uzenqj8aVTKmBN
APsfakWYxQxxakXRiCacObspp9gbC5R0NXOYl7ZAcrqLQzX+0HAZBL4aHIa2H1CgM0Y9mG
L+XmN/vaCKTUK9PCiVujWm+xHNI6eQisPpCm6EZc2yKNzc3unMO5pegBmBXh46bYVXzSup
YBW+wk+rWUIuDAuqHUmPRxGDY0dIALiRhEYJ/1xCohfI6VwNupyAATnjNNcSAWaV7s3INi
RAW0sFhUB7c+n1y3fliXw6DFOV1NwWq6f08lXDbeS5USeejnmw79M5Y5MPoAXg==
Date: Sun, 15 Dec 2024 17:25:29 +0100
From: Lars-Dominik Braun <lars@HIDDEN>
To: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: Re: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really
merge directories in install phase.
Message-ID: <Z18C-R2WaWqy9vSQ@HIDDEN>
References: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
<35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN>
<Z0lsD5JDyxEAGlEr@HIDDEN> <87v7vm1eo5.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <87v7vm1eo5.fsf@HIDDEN>
X-Rspamd-Queue-Id: 4YB7j75d5sz9slX
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: 74582
Cc: Tanguy Le Carrour <tanguy@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>, 74582 <at> debbugs.gnu.org,
jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>,
Sharlatan Hellseher <sharlatanus@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Hi,
> Yes, that could be nicer. I'd like to keep it for a distinct commti
> though, to keep this small and focus.
sure, fine.
> Perhaps, though we'd want to verify that it indeed now works, and not
> having seen that error once, I'm not too sure how to test it. Do you
> know of a package that could make use of this?
Hm, I checked and it does not seem to be possible to build more than
one wheel with a single pyproject.toml[1]. Let’s keep the code as is then.
Lars
[1] https://peps.python.org/pep-0517/#build-wheel states that
build_wheel() should return the basename of the .whl file it
creates. That implies it can only be one.
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at 74582) by debbugs.gnu.org; 14 Dec 2024 15:14:19 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Dec 14 10:14:18 2024 Received: from localhost ([127.0.0.1]:47994 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tMTqU-0006zu-GO for submit <at> debbugs.gnu.org; Sat, 14 Dec 2024 10:14:18 -0500 Received: from mail-pf1-f169.google.com ([209.85.210.169]:56751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tMTqR-0006zc-CG for 74582 <at> debbugs.gnu.org; Sat, 14 Dec 2024 10:14:16 -0500 Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-725d9f57d90so1954832b3a.1 for <74582 <at> debbugs.gnu.org>; Sat, 14 Dec 2024 07:14:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734189189; x=1734793989; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=Ps5om34P6ZsMXKapr9PnhCco3suScwE85kvWLKO6m+8Fve98nyC269MIxu1/TcWW5q rjBUxnnHDzRv+Dk0/B/JkKRCWsH1wgvGcyhA+uaT46kBdzuN/mskGQ7OtxpeeL9sTSsu AQA2L447AEqvs5Kv8775hs51J+Ji4kDSNCU4Wx6xvz/5uK6VhV7cRDOVXBRO94MeeJJ9 KYtFi9MACwtTuKl8uxlbf+JwVgyadGlkJwQs7pXpqXYWNXXJrIWQmNBZ/F2AjB+2STPY 8NpLW3Qkyo/cS+lnoELS+QD4d5e0R4KMoLCJJG7d6k8wnCehqwe8/wu6WbnpqIUuTlUx 7rgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734189189; x=1734793989; h=content-transfer-encoding:mime-version:user-agent:message-id:date :references:in-reply-to:subject:cc:to:from:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lgrGwnE578rxT885OU2i2pfNk66B5b/gzBdJ0WcSSdc=; b=nrek37meWK7bwuN2F/eloUZ0Dqt33DA0E7X3c10kSm0VFXrStHMO71Q84dtufNQ6W+ Ty5Vk5EA6t6oaEMfJ9FTwuFlQ18Rpb92qQ+XH4tyjrjkKaEe9s4sHsejcJQ/0ATJwxgc y0PmThkKZWjUNbvR0eH0TeF4KyF//eddBW5zvY9T2jPbQtu3qtUwpUnFAPLWAGToZxsP 6WInIoPDVReM6D6CIDi4C0bP1sbtIFZGmvYqLu80Dtw6UianfXvyg67v1GPvGcc60BZm Z2ibzQtPo+li3rSZd4hRa7B44lxLfxUkpYxnrHyR/1Ihdbu2jKhu2EwcsMBy2TCi+HVw ADLA== X-Gm-Message-State: AOJu0YyIk3Pppx9JIParahHhCfnuJx0MrW9IAsaOfex2dLGv97YTdnKW qIlDQRTbG/IUrZgBjWo8RslHvQCOOSnWRR4KZhN0Yp3F29bxZAVd X-Gm-Gg: ASbGnctbVsPtOK4IZJdPkZSvtgmdIZalRGu+dQWmNVcIvAmZb9fV0WzIs/c/kjvgBlv 3wx/ccxgIODrwWh/N4YUuqQLGupC9hOhH05V9w9rATcr2PH8vJSYIjsi5MBYKMjbsPnKa+/55TM dPDecOPo9MtStogDRPuf+irQWDo1m2ATLdA1E/Le97JI/GujSYactcjhNkoQkrsb61PkoPvA8m/ 3xetdu1tE6v96IP+/mTv4lz2ScXzVar0iRJzlj6HkN17FBbujGIbQ== X-Google-Smtp-Source: AGHT+IEPRsU60ptn2Dn3WXtxtqrvFmfaHS2P4xYJuDkH49JSwa8vNABau0hYZvlck7o1RB4hexgkFw== X-Received: by 2002:a05:6a21:1796:b0:1e1:a75a:c452 with SMTP id adf61e73a8af0-1e1dfdacb2fmr10810752637.19.1734189189532; Sat, 14 Dec 2024 07:13:09 -0800 (PST) Received: from terra ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-801d5c33f49sm1332453a12.69.2024.12.14.07.13.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Dec 2024 07:13:09 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: Lars-Dominik Braun <lars@HIDDEN> Subject: Re: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really merge directories in install phase. In-Reply-To: <Z0lsD5JDyxEAGlEr@HIDDEN> (Lars-Dominik Braun's message of "Fri, 29 Nov 2024 08:23:59 +0100") References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN> <Z0lsD5JDyxEAGlEr@HIDDEN> Date: Sun, 15 Dec 2024 00:12:58 +0900 Message-ID: <87v7vm1eo5.fsf@HIDDEN> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74582 Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, 74582 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) Hi, Lars-Dominik Braun <lars@HIDDEN> writes: > Hi, > >> + ;; Use 'copy-recursively' rather than 'rename-file' t= o guard >> + ;; against the odd case where DESTINATION is a non-em= pty >> + ;; directory, which may happen when using hybrid Pyth= on >> + ;; build systems. >> + (copy-recursively (string-append source "/" file) >> + (string-append destination "/" file= )) >> + (delete-file-recursively (string-append source "/" fi= le)) > > wouldn=E2=80=99t it be easier to remove this function entirely and move t= he > shebang-replacement via POST-MOVE into a separate function (perhaps > powered by FIND-FILES instead of SCANDIR)? Yes, that could be nicer. I'd like to keep it for a distinct commti though, to keep this small and focus. > I believe with this patch we can also remove &cannot-extract-multiple-whe= els > further down, since directories should be merged now, right? Perhaps, though we'd want to verify that it indeed now works, and not having seen that error once, I'm not too sure how to test it. Do you know of a package that could make use of this? --=20 Thanks, Maxim
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at 74582) by debbugs.gnu.org; 29 Nov 2024 07:24:13 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Fri Nov 29 02:24:13 2024 Received: from localhost ([127.0.0.1]:40738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tGvML-0007K2-8A for submit <at> debbugs.gnu.org; Fri, 29 Nov 2024 02:24:13 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:52924) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <lars@HIDDEN>) id 1tGvMJ-0007Jk-1v for 74582 <at> debbugs.gnu.org; Fri, 29 Nov 2024 02:24:11 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4Y04Rl20tTz9tD5; Fri, 29 Nov 2024 08:24:03 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001; t=1732865043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=f8onCShA5dE+WdU0Iha/bB4+Jmer/AlDxRjUU28b2J8=; b=JOM7cMyeKVElc4OFk4FztDuDpjw2uy44W7BvRYPPP2duD9X+fIpgK4vVwPm9ySVF0bMnSr klpM2xKC2ZkiX+9MBv8pl9YDh1S5BsfQBkIfIjeQrGguvWOLvnsCjgZtH8rKiurLZahQwZ Pyd/j9YQCGsX2rNZHCZtuneurc1oHomvuj3QaDVWbOL5oWuZHVtNwkywPrPLk12k3oKY2k XwoUdpmN6ODkFqUXhiWYfBL7kh8l7pVFGOeXsBLQ0eQ7/jshFngerB05dXBdhOEaGNfZzg E4oZCojmVvm8yHZTOjm9/LydxO7NRAYIpknGMu0x2B6v9bOSIm6ydLRs1F+Rrg== Date: Fri, 29 Nov 2024 08:23:59 +0100 From: Lars-Dominik Braun <lars@HIDDEN> To: Maxim Cournoyer <maxim.cournoyer@HIDDEN> Subject: Re: [bug#74582] [PATCH python-team 1/4] build/pyproject: Really merge directories in install phase. Message-ID: <Z0lsD5JDyxEAGlEr@HIDDEN> References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN> X-Rspamd-Queue-Id: 4Y04Rl20tTz9tD5 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 74582 Cc: Tanguy Le Carrour <tanguy@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, 74582 <at> debbugs.gnu.org, jgart <jgart@HIDDEN>, Marius Bakke <marius@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) Hi, > + ;; Use 'copy-recursively' rather than 'rename-file' to guard > + ;; against the odd case where DESTINATION is a non-empty > + ;; directory, which may happen when using hybrid Python > + ;; build systems. > + (copy-recursively (string-append source "/" file) > + (string-append destination "/" file)) > + (delete-file-recursively (string-append source "/" file)) wouldn’t it be easier to remove this function entirely and move the shebang-replacement via POST-MOVE into a separate function (perhaps powered by FIND-FILES instead of SCANDIR)? I believe with this patch we can also remove &cannot-extract-multiple-wheels further down, since directories should be merged now, right? Cheers, Lars
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 18:45:08 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 13:45:08 2024 Received: from localhost ([127.0.0.1]:39718 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tGjVj-0002Ay-SE for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 13:45:08 -0500 Received: from mx1.dismail.de ([78.46.223.134]:41659) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <jgart@HIDDEN>) id 1tGjVh-00026t-3n for 74582 <at> debbugs.gnu.org; Thu, 28 Nov 2024 13:45:06 -0500 Received: from mx1.dismail.de (localhost [127.0.0.1]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 006faf3a; Thu, 28 Nov 2024 19:44:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=dismail.de; h= mime-version:date:content-type:from:message-id:subject:to:cc :in-reply-to:references; s=20190914; bh=F+oJS9nLX43khNIwXjWL9Xd6 PJQKHnSE5/hLQIgXo24=; b=IvlX8a89j4MblBhc3AUKlMdzaNxDeceU3QeTt+wW q1Y1Fn5O2En5lYLl4SuVqHyKMbX7j7nwV6DI0AbBaNc6VzXoBnRyi9s1j25EodVy qKu0t4TlZWHd5hrjcGHm1EAoysLjMr5xgraOxXFHXTz+oKy3MTnyEHMCGK+qsPhF uza88OOa+hTGIToigKEKAEPh8fGIrwcvEEMMpTgFIoFbtDMu/DftDMcNN4ZEcTkk iuY8n60R3HskQY0SGV5WIts2SR01qx0b866Y/zZmcjU9BRxJWpE54OZt3VfRGKXu JwqQ/gkQDzdfcUkprnYbLFp99vR6hNrLKgkcvFAYQEKj1Q== Received: from smtp2.dismail.de (<unknown> [10.240.26.12]) by mx1.dismail.de (OpenSMTPD) with ESMTP id 7fb8bb93; Thu, 28 Nov 2024 19:44:55 +0100 (CET) Received: from smtp2.dismail.de (localhost [127.0.0.1]) by smtp2.dismail.de (OpenSMTPD) with ESMTP id 552e08cc; Thu, 28 Nov 2024 19:44:55 +0100 (CET) Received: by dismail.de (OpenSMTPD) with ESMTPSA id 5d0af906 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Thu, 28 Nov 2024 19:44:54 +0100 (CET) MIME-Version: 1.0 Date: Thu, 28 Nov 2024 18:44:54 +0000 Content-Type: multipart/alternative; boundary="4465e215-9ab7-4a9f-9875-61ecc4dcd991-1" From: "jgart" <jgart@HIDDEN> Message-ID: <32738d465626faf1db388e920830030a7c743fe5@HIDDEN> TLS-Required: No Subject: Re: [bug#74582] [PATCH python-team 4/4] build/pyproject: Resolve import warning. To: "Maxim Cournoyer" <maxim.cournoyer@HIDDEN>, 74582 <at> debbugs.gnu.org In-Reply-To: <aebd13c4b0d7daed770c6e79a1b112f25e023a5d.1732781055.git.maxim.cournoyer@HIDDEN> References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> <aebd13c4b0d7daed770c6e79a1b112f25e023a5d.1732781055.git.maxim.cournoyer@HIDDEN> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 74582 Cc: Sharlatan Hellseher <sharlatanus@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) --4465e215-9ab7-4a9f-9875-61ecc4dcd991-1 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Thanks! Would anyone else like to review this? I won't be able to test and review= it for up to a week. LGTM, otherwise. all best, jgart --4465e215-9ab7-4a9f-9875-61ecc4dcd991-1 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: quoted-printable <!DOCTYPE html><html><head><meta http-equiv=3D"Content-Type" content=3D"t= ext/html; charset=3Dutf-8"></head><body><div>Thanks!<br><br>Would anyone = else like to review this? I won't be able to test and review it for up to= a week.</div><div><br></div><div>LGTM, otherwise.<br></div><div><br></di= v><div>all best,<br></div><div><br></div><div>jgart<br></div><div><br></d= iv></body></html> --4465e215-9ab7-4a9f-9875-61ecc4dcd991-1--
guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 12:18:23 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 07:18:23 2024 Received: from localhost ([127.0.0.1]:37090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tGdTT-0005yY-0R for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:23 -0500 Received: from mail-pl1-f174.google.com ([209.85.214.174]:51363) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tGdTN-0005xv-9E for 74582 <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:17 -0500 Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-211fcadd960so4718545ad.2 for <74582 <at> debbugs.gnu.org>; Thu, 28 Nov 2024 04:18:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732796231; x=1733401031; 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=fJdX8N01IhvZPS+nW+7kClioL+RUNpECJx6ochw4vF0=; b=e1Wl0fEJPitax+m5EIlK0fU60cfGb+x2QvE5frook52z7AvViGHuijtTwQmMSeqbId xsM9/qYZF4lmiMUKP08rtfSSz3FhdhK3OVl/dtCsZZlYFl9TKNadUV0u8o7I2+CPhkrL EE1AjQvdkXBFh9n94y9USMJMTexe2kSONoOZ1qT2Y6/v5qg/PED05nvfEvU+E3WwP6Kz OQr/Sr1FR8j4GI0Pudazbho86T6oi2Rhv3+K1bYq1ffSOucHCIDuiJpSAJHEF2Bi747z UTvdUjPzt/VnoemIpyVAEzn3EpDktBj90S944jgPa7MKiEnZXsH7Kd83xwKf4peNc0rO 3NGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732796231; x=1733401031; 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=fJdX8N01IhvZPS+nW+7kClioL+RUNpECJx6ochw4vF0=; b=tE3dtYXtofelrIu0w/NszkDtDv/P7sVNrzp43l4YuKk39svcSuF8INKb9QLxI4M0CE /5XPNdZQxbjOMDFZjQ4UL2pcGUG9NpZFC0bpGURt/EvzbbvEMRBFUz7CcCXSS4GSpQB7 LcbYKpHBM7TQ7+GYlbIDSVoVhR812zqDuSUpWL/1XZlp2TMDshjryjrTm3HUqtuKLwRK HJmFe3JlkR2AcThaSFYC/5LzNb4kqB+hpPNzW3BUfC9t/TaEx5crVZfg3Gbe2cSF7oBJ gNSZ3mA5uVJPWV/2aSFc0dXpE8KXhUK+tYkI6h5xTiDo4vAHiIOyfLCR25vKk9nTm114 I89g== X-Gm-Message-State: AOJu0Yw8mLUdigTbWohFlRYv7YV5S3DGHquiPmUfIcmhqEdSw5Oo5C9Z 3lZ8/ARABa15/x+fi9U8FaT9WxuQg7SIUFIaaFNPkpY5CX7rQK1tSdAeNw== X-Gm-Gg: ASbGncvUCOcwLoMMKttCrqME74u2ZEaVFLkzPGERBgZNYQLsYQ3LbDDSektQuHpGzoT xmzMzYz6NOu9TQB5kpteB+USnwOBq5m60mEgSO39iFpx60U4gTRWRfHj/53MI1mjmEmzY0JbViN j0DNhwNoMd5Bi7f/Mzm94mQCwJVSl5cvkxn3QQIeWmtnWVE2pe20LoLduZrKVRnybKUN8oJYsCg eq2Y0ChHJFV4EjXON+k/DuCYGkcNz7RzrHe2DU50EhDc7n6ffKWegWtVDy00M9LH5DN X-Google-Smtp-Source: AGHT+IFllfRr2lZ4eOSETFNvKJh8nZKufWLXJVDF2TUHNinFTpOrvsVPPzsCBevpEOrrGFdLf9+jGw== X-Received: by 2002:a17:902:ccd1:b0:20c:79f1:fee9 with SMTP id d9443c01a7336-2150109609cmr90075535ad.11.1732796231154; Thu, 28 Nov 2024 04:17:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 04:17:10 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: 74582 <at> debbugs.gnu.org Subject: [PATCH python-team 4/4] build/pyproject: Resolve import warning. Date: Thu, 28 Nov 2024 21:16:42 +0900 Message-ID: <aebd13c4b0d7daed770c6e79a1b112f25e023a5d.1732781055.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.46.0 In-Reply-To: <cover.1732781055.git.maxim.cournoyer@HIDDEN> References: <cover.1732781055.git.maxim.cournoyer@HIDDEN> MIME-Version: 1.0 X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN> Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 74582 Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) * guix/build/pyproject-build-system.scm: Hide the 'delete' symbol from the imported (guix build utils) module to avoid a naming clash warning. Change-Id: I7db9500b20c71c89e740c18c089f33c8569c4ffd --- guix/build/pyproject-build-system.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm index 314839c30f..beca4dc8ca 100644 --- a/guix/build/pyproject-build-system.scm +++ b/guix/build/pyproject-build-system.scm @@ -19,7 +19,7 @@ (define-module (guix build pyproject-build-system) #:use-module ((guix build python-build-system) #:prefix python:) - #:use-module (guix build utils) + #:use-module ((guix build utils) #:hide (delete)) #:use-module (guix build json) #:use-module (ice-9 match) #:use-module (ice-9 ftw) -- 2.46.0
maxim.cournoyer@HIDDEN, lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.
Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 12:18:16 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 07:18:16 2024
Received: from localhost ([127.0.0.1]:37087 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tGdTL-0005y8-Fr
for submit <at> 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 <maxim.cournoyer@HIDDEN>) id 1tGdTH-0005xU-I2
for 74582 <at> 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 <at> 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 <maxim.cournoyer@HIDDEN>
To: 74582 <at> debbugs.gnu.org
Subject: [PATCH python-team 2/4] build/pyproject: Fix indentation.
Date: Thu, 28 Nov 2024 21:16:40 +0900
Message-ID: <90f63776c70ab18318067ceaab407f72b5093876.1732781055.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
References: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>,
Sharlatan Hellseher <sharlatanus@HIDDEN>,
Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74582
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* 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
maxim.cournoyer@HIDDEN, lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.
Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 12:18:15 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 07:18:15 2024
Received: from localhost ([127.0.0.1]:37085 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tGdTL-0005y6-4c
for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:15 -0500
Received: from mail-pl1-f181.google.com ([209.85.214.181]:46221)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tGdTF-0005xX-Qv
for 74582 <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:10 -0500
Received: by mail-pl1-f181.google.com with SMTP id
d9443c01a7336-20cf3e36a76so6738335ad.0
for <74582 <at> debbugs.gnu.org>; Thu, 28 Nov 2024 04:18:09 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1732796228; x=1733401028; 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=4XazsZnpMbTeGzro9jkO+LdEGRQM/WrXy2RjxHeK/LM=;
b=UheW/x9Wq9JbM8qv7/Utun2UUXu0cSU+xY9bc75COnzDAfd/TteHSLIgNqqCSor0g8
msXLtgWyREweZq/kQZIS/cEFoGqrmlPvYhEYKtohVFZT1QHFVpTUOkmHyWLeER+CFOii
78DQPY/4bs/Td4h/DmyNJoQ7qJPkXthttadk/XHK7X+iqeyXfunk9BCfJttXQDESTbVr
5bEYEUuMk6JkoeTqotyizzc6ChoNhtvmskY2KB+yN3FZc06w24F/KBfvQryqbyR9L+NZ
0j6CFmYeSldn0E3BtRqdehR9Jn6+lvICO7ytY4aqlqO6v7/rq8n3oUW9931AxvFWti9I
9tCw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1732796228; x=1733401028;
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=4XazsZnpMbTeGzro9jkO+LdEGRQM/WrXy2RjxHeK/LM=;
b=c5h+jqAHlqQv8niOsoiCAAMVfBI8KSFQ4D/bSb3XvkuKjNNiCOVNrHKAQKjnGHcz+Q
6wf4sithvZpu68Xy2r4F4NCVItvDcmytRQ1qWQ9tIo5bPxWcvZLQC7JC/10HW95HKV1v
CH1PWP4IMzWNTl7jDVoZDxoiEooo+DxBhJTRSjBzWrrd/CPmznZrhYRdiir99pwUJt2A
lZSVja27M0HvmR/RiGhZwsj6gGHcjBYayn8fltIEoMz5rCtpoBqhG/r0nP8tkepQ+c2P
FDO5CxC3FBEkBkzMm/PAMk6tfsbyijKaZz4t56M5gpZrpGRBk+khCSMD8cuUFKd+JaDQ
x/8Q==
X-Gm-Message-State: AOJu0Yz1o5UFTwxStcXtCuWcU1lHrPd0KHT9inDVOAZRKIhJHbblo7Ya
xra6Bzh2vkw3EC02DjUEvMVA6EHLafFpwvpKu06otee//0d5+tvIL6QciA==
X-Gm-Gg: ASbGncuIEy1WzNYJtvJhzalygsLQ5Op9RqdCtVcEzrML9jjKi7NxvkxoI+YrN9BoJ+E
SWb2bYGnQEaexHmwtmQnpNcwBcezYq2LYOv0d4MqXBc60+e5fpEuurD1KIten5MmHC/bRBZc038
ysX9p03IlPnECeJ4I9wVGIsuo5HEc8cKLpNaMr7qEHetxqKcFxTLFDpU6ul3gLoLn3l/w0O/2eE
8KWpDQ5mvVXwxXWWDwsnFkTXVfS0VFcSOttdqgeeyPypsiRfcz6MqQxGooBUFHVT2oO
X-Google-Smtp-Source: AGHT+IEf15l8cr6joBCcuzsDlxDIaMiKdYzpBifiEHKjOXRTfde+sDdbvzBeBFTEYy3WBmh+KNLO6g==
X-Received: by 2002:a17:902:e843:b0:20c:f261:2516 with SMTP id
d9443c01a7336-2150108631emr84669435ad.8.1732796228276;
Thu, 28 Nov 2024 04:17:08 -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.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Nov 2024 04:17:07 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74582 <at> debbugs.gnu.org
Subject: [PATCH python-team 3/4] build/pyproject: Update PEP 427 reference URL
in comment.
Date: Thu, 28 Nov 2024 21:16:41 +0900
Message-ID: <47f64576e3feaf679e1486a86e58417cb87f7d87.1732781055.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
References: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>,
Sharlatan Hellseher <sharlatanus@HIDDEN>,
Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74582
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* guix/build/pyproject-build-system.scm (install): Update reference URL.
Change-Id: Icf5dcc7254c33e8e466773ee66a2fd5648d583da
---
guix/build/pyproject-build-system.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index d42577b259..314839c30f 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -172,8 +172,9 @@ (define* (check #:key tests? test-backend test-flags #:allow-other-keys)
(format #t "test suite not run~%")))
(define* (install #:key inputs outputs #:allow-other-keys)
- "Install a wheel file according to PEP 427"
- ;; See https://www.python.org/dev/peps/pep-0427/#installing-a-wheel-distribution-1-0-py32-none-any-whl
+ "Install a wheel file according to PEP 427."
+ ;; See <https://packaging.python.org/en/latest/specifications/\
+ ;; binary-distribution-format/#binary-distribution-format>.
(let ((site-dir (site-packages inputs outputs))
(python (assoc-ref inputs "python"))
(out (assoc-ref outputs "out")))
--
2.46.0
maxim.cournoyer@HIDDEN, lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.
Received: (at 74582) by debbugs.gnu.org; 28 Nov 2024 12:18:11 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 07:18:11 2024
Received: from localhost ([127.0.0.1]:37082 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tGdTG-0005xl-PQ
for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:11 -0500
Received: from mail-pf1-f180.google.com ([209.85.210.180]:48435)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maxim.cournoyer@HIDDEN>) id 1tGdTE-0005xO-V9
for 74582 <at> debbugs.gnu.org; Thu, 28 Nov 2024 07:18:09 -0500
Received: by mail-pf1-f180.google.com with SMTP id
d2e1a72fcca58-7250c199602so652284b3a.1
for <74582 <at> debbugs.gnu.org>; Thu, 28 Nov 2024 04:18:08 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1732796222; x=1733401022; 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=dzDijL/PyuLE584GxeB7TNf806cxuVb6ixuA7CdOayI=;
b=k2hboykuhjxJlnjWn0HWml8nrqs6dgf8221woe8dJ2PjOd53M3czkTXiG2LZCBwDLn
wXKuQ4UIDLxDCW6KecENmf6w9WhJVSiO0nD9876buctjmuay0c4gc1NIRSWhOHRXyjlB
9/avtc3+SxIKeyZg+fou0un248P3KOZljNO75F0FhCCIXfYuFQnQpkeilbcUG0ASkYPN
3Qs+2yIw9QBsbWCTSKyp4x2Qj9eM7NZQikqBVC5lR39yayqKqMO4itTXypbP6Xe/I7M9
FDWh/sC74v6/I1ENyKxvQ84lOjvBlccMjY+g6c5z6QNYP1UWEHGTbrEBYXWHLF9q0gNr
xs4w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1732796222; x=1733401022;
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=dzDijL/PyuLE584GxeB7TNf806cxuVb6ixuA7CdOayI=;
b=lJz9RrkHEkTHDCq6Z9t4csTwJwsB6Uxc4FVG1D6Po++QuCLsCBNVwmRJj73ExSb3VY
Foi9NNiR/LFf8r9CalLqzlfDt6jSWIP2pa98wgDLANrci6/WS7BdC0g39bcZXoGPQhfK
dO7EmD2wU29Q2AlBA/lF9EHA48AJyUOyQrky6A+6YNorvQMEfKYl838DdljBSiIm/sbJ
HsdnQgTU4pWFJEKDo+SeE5v0ibLgvd8WuxAADSMLVVNAEnIdLaRS1JJV8m6+PQOD2ElY
KH1wsHz/fOxBf3kNbNPK6hg6ZkCsJy+Wo6G6n7iE1ZQ0ZXjXRa+QM6/20F35fRua1rXS
2raA==
X-Gm-Message-State: AOJu0Yxg/Iz2JVWOtDvQcs82cdGjO/KoORMU1nugmMnckfmiZsIwhGic
7gdXid1YC+7gUg6mQyYVbFECF7hZPaLl6zO5qMn+8IBLJ9erxWzfmaIGbg==
X-Gm-Gg: ASbGncsg2d0AU1bOC76/NloLxqQhqpTN4c4pQWtBL5HPGtqZ247sU4mOweYZBxjd0he
llp3RZsDtVHvR/q2ELpGiEzeG9XuNzcNpdq4mu9huTxB0oSq8LoMY7UW3c7ba2ah0lg24yWGymq
KKpVwOIliDNDuESDEZf7OR0h13UC7vieY68Tz44fTbNyRS1soW7HspSKUpgJo2dgQsBpH2g6vDp
gXzJJi7UvRT0W0yopVD3mWNLXoqh0wBM3Ol/wdNflw7zKPwJ7v1E0XeYj6yNoQjswXo
X-Google-Smtp-Source: AGHT+IHd33GYf0/zTzmjt+IiG1fF2FGTBGguOZZtqrMKALNgVtbq5HaDU2X1fG5vUYk0ClR4vgyxLw==
X-Received: by 2002:a17:903:2b0e:b0:211:ebd:e370 with SMTP id
d9443c01a7336-21501385f12mr89893555ad.25.1732796222320;
Thu, 28 Nov 2024 04:17:02 -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.00
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Nov 2024 04:17:01 -0800 (PST)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
To: 74582 <at> debbugs.gnu.org
Subject: [PATCH python-team 1/4] build/pyproject: Really merge directories in
install phase.
Date: Thu, 28 Nov 2024 21:16:39 +0900
Message-ID: <35ca6b4d6fb04d511694f38e52e766134b8565dc.1732781055.git.maxim.cournoyer@HIDDEN>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
References: <cover.1732781055.git.maxim.cournoyer@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>,
Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>,
Munyoki Kilyungi <me@HIDDEN>,
Sharlatan Hellseher <sharlatanus@HIDDEN>,
Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 74582
Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Using rename-file, the destination had to be empty otherwise it would error
out. By using copy-recursively, a directory can be copied onto a pre-existing
directory, really merging them. This problem manifested itself attempting to
build the python-pyre package.
* guix/build/pyproject-build-system.scm (install)
<merge-directories>: Use copy-recursively instead of rename-file.
Change-Id: Iceb8609a86f29b17e5fbe6a9629339d0bc26e11f
---
guix/build/pyproject-build-system.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/build/pyproject-build-system.scm b/guix/build/pyproject-build-system.scm
index c69ccc9d64..03992d915f 100644
--- a/guix/build/pyproject-build-system.scm
+++ b/guix/build/pyproject-build-system.scm
@@ -194,8 +194,13 @@ (define* (install #:key inputs outputs #:allow-other-keys)
(format #t "~a/~a -> ~a/~a~%"
source file destination file)
(mkdir-p destination)
- (rename-file (string-append source "/" file)
- (string-append destination "/" file))
+ ;; Use 'copy-recursively' rather than 'rename-file' to guard
+ ;; against the odd case where DESTINATION is a non-empty
+ ;; directory, which may happen when using hybrid Python
+ ;; build systems.
+ (copy-recursively (string-append source "/" file)
+ (string-append destination "/" file))
+ (delete-file-recursively (string-append source "/" file))
(when post-move
(post-move file)))
(scandir source
--
2.46.0
maxim.cournoyer@HIDDEN, lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.Received: (at submit) by debbugs.gnu.org; 28 Nov 2024 08:05:38 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 28 03:05:38 2024 Received: from localhost ([127.0.0.1]:36464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tGZWs-00029q-JU for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 03:05:38 -0500 Received: from lists.gnu.org ([209.51.188.17]:45318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tGZWr-00029j-Dq for submit <at> debbugs.gnu.org; Thu, 28 Nov 2024 03:05:37 -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 <maxim.cournoyer@HIDDEN>) id 1tGZWq-00024V-87 for guix-patches@HIDDEN; Thu, 28 Nov 2024 03:05:37 -0500 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@HIDDEN>) id 1tGZWo-0006p1-S8 for guix-patches@HIDDEN; Thu, 28 Nov 2024 03:05:36 -0500 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-21527bb7eb0so1736615ad.3 for <guix-patches@HIDDEN>; Thu, 28 Nov 2024 00:05:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732781133; x=1733385933; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=wmj4JqfN8lJuJLn592f3bvfxvUXful5Fr8dFKygoUEE=; b=jEUPEhRgjYk6tyvofUqA/8Ph0Wm6mOfR6kqyKeLBqpvtPHXKT/GdQJ2I/kkowwEzTK AwGA+TM7Fp4kEZVI0q1IfIyoznbdCzHLowhP3nlWOZW379pgQsdGow4o/l1K759Hed8B HxLt84M5v+UdJl7tWW9hGU7gDGsQkEbWr5UfcZnMqhfr93FsXvSLUyKL1jaqm8kFXhEf WzP4/ixhXU1O+wfvoOsIqeLx61iHYOBq+zB8AhvJmagAD9XR3REuQi6JtvzdoiiwKEQI NAAAygJpFZON9yhZfPyDcUpAYbWN5gwskc4ygrxNuC99QKKc34ID+vvDg68hyH/ntbm2 4KFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732781133; x=1733385933; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wmj4JqfN8lJuJLn592f3bvfxvUXful5Fr8dFKygoUEE=; b=gCwk/IB7zLIWpzngDUopCA0yJWJAR/NhDEO6jByIu5ox4CPJPU5IIuw57x/C3qESgz sMlT2taFnxcKjvr4+MPDrkDr8sZvzw6lcakKyjKIzCmgrZ705T6ZFctwnLyam0HDU6Zw YyrHbId5ph9M+XigHUC9zBpqNT11Y5mkeiQ17elKlbJLiJpdoOyjpTPrnt1Tjeaz91PN 87rL8lgIsLGsw2yOgrEg3oydT5tZm/gGQwISeUPB5cqdEEZ5jPKN711zMaFVJtCrMFBU I9ZuEHuybaImROt4L3QxdM8Xhv35+elox4lMCeHwohMGJZRrqrl3KoDEBmkPLVXtN67Y b2cA== X-Gm-Message-State: AOJu0YzJqFcxf1Ntshb2q62Ebf4MrXEajYl8zseNQEy/iFtzpENC2B58 cZt5oQfUoD8xvprYSIIE6zoiF9/9NhPs3vgjgPmA1r2sX+WSqGQW1p6B2g== X-Gm-Gg: ASbGncvElYO/JwPMFy8XPpfmt9yGJ1qpOAvDVSA8oi6LTSsMn95PaQJWlguenoI9EC1 sGwfVIIa6CINeEU7UA7D9fKK1rWDIp8SIn7SS4l8/3shvDCf0FPNG5SHDUNmFWx5LOfV1mjFmp7 4pqlco8E5OBld9sSt4R2kCgRFY9W6J+aB3uuolTG/ptP5xlFZTPQBVB3HMKGIuVc5NhL1Q/B0pB LKEKhshGFbUEiM1Queg9eK65u9gH2EwqB86OtSkHtOCJKkyAk9gwS0wCYypizEUcm+K X-Google-Smtp-Source: AGHT+IHVEwdP2vvZ2XTwH+ysXc5bj2qWuiRwTqqr26F6O7pP6BjzODE985ce3UJ5f/YJtXStpADRsQ== X-Received: by 2002:a17:902:fc8e:b0:20c:dbff:b9d8 with SMTP id d9443c01a7336-21501e5c131mr82977665ad.37.1732781132903; Thu, 28 Nov 2024 00:05:32 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-215219830ccsm7600005ad.201.2024.11.28.00.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Nov 2024 00:05:32 -0800 (PST) From: Maxim Cournoyer <maxim.cournoyer@HIDDEN> To: guix-patches@HIDDEN Subject: [PATCH python-team 0/4] Fix edge case in pyproject-build-system Date: Thu, 28 Nov 2024 17:05:19 +0900 Message-ID: <cover.1732781055.git.maxim.cournoyer@HIDDEN> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Debbugs-Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN> Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::62d; envelope-from=maxim.cournoyer@HIDDEN; helo=mail-pl1-x62d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN> X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.3 (--) Maxim Cournoyer (4): build/pyproject: Really merge directories in install phase. build/pyproject: Fix indentation. build/pyproject: Update PEP 427 reference URL in comment. build/pyproject: Resolve import warning. guix/build/pyproject-build-system.scm | 52 +++++++++++++++------------ 1 file changed, 29 insertions(+), 23 deletions(-) base-commit: dd4b96e72c8fda4b025a75b47212e06e381e9ea1 -- 2.46.0
Maxim Cournoyer <maxim.cournoyer@HIDDEN>:lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN.
Full text available.lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:bug#74582; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.