From patchwork Wed Oct 26 13:44:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tanguy LE CARROUR X-Patchwork-Id: 44140 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 EB2A827BBEA; Wed, 26 Oct 2022 14:46:52 +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 2C3AE27BBE9 for ; Wed, 26 Oct 2022 14:46:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ongjd-0002Yz-GF; Wed, 26 Oct 2022 09:46:22 -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 1ongjO-0000hp-Bw for guix-patches@gnu.org; Wed, 26 Oct 2022 09:46:13 -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 1ongjL-0001yQ-Gj for guix-patches@gnu.org; Wed, 26 Oct 2022 09:46:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ongjK-0001CT-7A for guix-patches@gnu.org; Wed, 26 Oct 2022 09:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58792] [PATCH v2 1/2] gnu: python-filelock: Update to 3.8.0. References: <20221026071312.4635-1-tanguy@bioneland.org> In-Reply-To: <20221026071312.4635-1-tanguy@bioneland.org> Resent-From: Tanguy Le Carrour Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Oct 2022 13:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58792 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58792@debbugs.gnu.org Cc: Tanguy Le Carrour Received: via spool by 58792-submit@debbugs.gnu.org id=B58792.16667919174540 (code B ref 58792); Wed, 26 Oct 2022 13:46:02 +0000 Received: (at 58792) by debbugs.gnu.org; 26 Oct 2022 13:45:17 +0000 Received: from localhost ([127.0.0.1]:53755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ongia-0001B9-SF for submit@debbugs.gnu.org; Wed, 26 Oct 2022 09:45:17 -0400 Received: from relay10.mail.gandi.net ([217.70.178.230]:43963) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ongiY-0001As-Ez for 58792@debbugs.gnu.org; Wed, 26 Oct 2022 09:45:15 -0400 Received: (Authenticated sender: tanguy@bioneland.org) by mail.gandi.net (Postfix) with ESMTPSA id AC30024000F; Wed, 26 Oct 2022 13:45:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bioneland.org; s=gm1; t=1666791908; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=k2z4uP6GaGz5LHNyTPRg4h9rZ3FSjX4RGzvlvaJKVIY=; b=Ati0FLnVWPhGnvX/N6f+gwr5vVcjmp28iUSMNID+cyZukURKg8esneD2jTqyw0mN8iFrFg BPDYSU0s2FVI3KCYe0TbQH9GV9jEAvIloh69SZPOoFke0dXlUkqdMNDhLQ0aLRdJrE0jLD ES5i3SHoBFx+WDO/lCFRtoWrlgzlnIFR+NNy3WKZ9j+jOGOW458HdjGTGi0M0OGKvI1fds B/+cZtv01T+49wkEfUZENCSUWyxUVkZCZNgqFU8MygH1Rr2iDNEXeCjgEHVoNr1i6j4SPA 4cw/uQMT2PjL9l5W1lNzsvw2IGjE/UbbGXnJDeAwV1U3oSXEw+4OECdI6YDsZQ== From: Tanguy Le Carrour Date: Wed, 26 Oct 2022 15:44:34 +0200 Message-Id: <20221026134435.16235-1-tanguy@bioneland.org> X-Mailer: git-send-email 2.38.0 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi Guix, This was less trivial than what I expected, indeed. I'm adding python-virtualenv to the patch set as it now builds. Unfortunately, I couldn't make it up to Poetry, because, for unknown reasons (to me), building poetry with updated python-filelock and python-virtualenv triggers a **LOT** of rebuilds! I `Ctrl+c` the process when it started building things related to wayland and to modem-manager!? If someone was kind enough to tell me why, it would be very much appreciated! Thanks * gnu/packages/python-xyz.scm (python-filelock): Update to 3.8.0. [arguments]<#:phases>: Build the package PyPA's style. [native-inputs]: Add python-pypa-build, python-setuptools, python-setuptools-scm. --- gnu/packages/python-xyz.scm | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 08a33061a9..655d4501b0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1978,15 +1978,47 @@ (define-public python-fb-re2 (define-public python-filelock (package (name "python-filelock") - (version "3.0.12") + (version "3.8.0") (source (origin (method url-fetch) (uri (pypi-uri "filelock" version)) (sha256 (base32 - "0ngzlvb5j8gqs2nxlp2b0jhzii792h66wsn694qm8kqixr225n0q")))) + "1p2f1il288abcrjx002w25dzl9jd1392cfminv2rh8bgcsm7qi2m")))) (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'compatibility-fixes + (lambda _ + ;; We have an outdated version of setuptools-scm + (substitute* "pyproject.toml" (("7.0.5") "6.3.2")))) + (replace 'build + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + ;; 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)))) + (delete 'check)))) ; pytest causes a circular dependency (?) + (native-inputs (list python-pypa-build python-setuptools python-setuptools-scm)) (home-page "https://github.com/benediktschmitt/py-filelock") (synopsis "Platform independent file lock")