From patchwork Thu Feb 20 07:53:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 38869 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 17C8D27BBEA; Thu, 20 Feb 2025 09:21:41 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 7CC3027BBE2 for ; Thu, 20 Feb 2025 09:21:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tl2jz-00064P-EH; Thu, 20 Feb 2025 04:21:07 -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 1tl2jx-00063U-0g for guix-patches@gnu.org; Thu, 20 Feb 2025 04:21: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 1tl2jw-0001gO-Ni for guix-patches@gnu.org; Thu, 20 Feb 2025 04:21:04 -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:Date:From:To:In-Reply-To:References:Subject; bh=pT62PMe53QrVYiK4F8RqDdqUkAk3SdH1iPVXxOyx/bE=; b=d8hd/WKX7Q+LgKNygKQbQnrNcbVMKU9Ez45C42R6P3qAI54d62wMlLTP5a6KNTaWLGraDwKpHhLHiGb0DsR3QXjD7Jx8+kNPa94YFf82g6W3B4iWITp0eWx3xMaH7nj8J3/GKzzDQV7VXmJ5ZqNaZk7bXSltW+/BHP697hVvgFy0vd+PW0n7JGF1VigzyOA3JfkvSTLi8EsFJsJOpbI78jXbmQF+IikIu137yjJfFFk/IG2x+Qx7XX2n5E+WHHYMmHFqShhFq3JbkePpXb8pyG+Ad0D2tSHQv2m7C2yH/52+QT+Urr0m+MDMogKuwQYCi8gNYk6l5/POYFmkuuj/dA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tl2jw-0002Wk-Gf for guix-patches@gnu.org; Thu, 20 Feb 2025 04:21:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76436] [PATCH python-team v2 3/4] gnu: python-watchgod: Rename package to python-watchfiles. References: <87o6yxoxg8.fsf@ngraves.fr> In-Reply-To: <87o6yxoxg8.fsf@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Feb 2025 09:21:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76436 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76436@debbugs.gnu.org Received: via spool by 76436-submit@debbugs.gnu.org id=B76436.17400432309454 (code B ref 76436); Thu, 20 Feb 2025 09:21:04 +0000 Received: (at 76436) by debbugs.gnu.org; 20 Feb 2025 09:20:30 +0000 Received: from localhost ([127.0.0.1]:59998 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tl2jN-0002SJ-DM for submit@debbugs.gnu.org; Thu, 20 Feb 2025 04:20:29 -0500 Received: from 9.mo583.mail-out.ovh.net ([178.32.96.204]:42443) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1tl2jJ-0002Ra-FU for 76436@debbugs.gnu.org; Thu, 20 Feb 2025 04:20:27 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.25.15]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Yz75g3JHsz1SJg for <76436@debbugs.gnu.org>; Thu, 20 Feb 2025 09:20:23 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-srv5q (unknown [10.110.101.25]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 051811FEC4 for <76436@debbugs.gnu.org>; Thu, 20 Feb 2025 09:20:22 +0000 (UTC) Received: from ngraves.fr ([37.59.142.112]) by ghost-submission-5b5ff79f4f-srv5q with ESMTPSA id i+6WMNbztmeNoRsAfHOgmQ (envelope-from ) for <76436@debbugs.gnu.org>; Thu, 20 Feb 2025 09:20:22 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-112S00672d2f7c1-3b19-4070-9572-66bea27ec14b, 3504AAD960A9D73423D68DF730709AC4C04CB632) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 90.92.117.144 Date: Thu, 20 Feb 2025 08:53:26 +0100 Message-ID: <87wmdlnfai.fsf@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17570512472606827106 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdeiieejlecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeetfeeukeehledtffdvieeuleejkefhudeuhfdukefgtdevgeetgedtkeehueeivdenucffohhmrghinhepghhithhhuhgsrdgtohhmnecukfhppeduvdejrddtrddtrddupdeltddrledvrdduudejrddugeegpdefjedrheelrddugedvrdduuddvnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpehnghhrrghvvghssehnghhrrghvvghsrdhfrhdpnhgspghrtghpthhtohepuddprhgtphhtthhopeejieegfeeiseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeefmgdpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=pT62PMe53QrVYiK4F8RqDdqUkAk3SdH1iPVXxOyx/bE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1740043223; v=1; b=t99/tJoJxpCkZNr8+0PKkJAk8XuUXNX1pZMS9Rb8l3TvMgoSYc25mILDj4Uk3qcKgkvJrqgF JBBVTXViiHAyIDsZK/xHiKOxww24CcLb0ggg6cnlYpWuVzg+VHn0hXLlW5KIuYOornosYIkp0XE YA9dlLcGjr1y07BDGF4kqJddgeEznDuX22OXX3qMTF5nLcA3nu+1cCDK12RsOKGkkXjcPwdrquN iIm06lhy9Uqgjj5e4Dk/Z9AKQKR+Gupa2BNaJ7+Z3echGgw1TaBtQd4TcqX2cvY+3S8/FXZeMsg +M8TYTuSOJMHw0jRkyEkh/ehz4DQeigCzNdWSGHWOxP2w== 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: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-xyz.scm (python-watchgod): Define in terms of 'deprecated-package'. [version]: Update to 1.0.4. [build-system]: Switch to cargo-build-system. [arguments]: Likewise. [native-inputs]: Add maturin, python-dirty-equals, python-pytest-timeout, python-wrapper. Remove python-pygments, python-pytest-sygar, python-setuptools and python-wheel. (python-watchfiles): New variable, formerly known as "python-watchgod". --- gnu/packages/python-xyz.scm | 59 ++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 18 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f738b2b00c..b9a970a60d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -300,6 +300,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xorg) + #:use-module (guix deprecation) #:use-module (guix packages) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) @@ -32455,37 +32456,56 @@ (define-public python-watchdog but portable.") (license license:asl2.0))) -(define-public python-watchgod +(define-public python-watchfiles (package - (name "python-watchgod") - (version "0.8.1") + (name "python-watchfiles") + (version "1.0.4") (source (origin ;; There are no tests in the PyPI tarball. (method git-fetch) (uri (git-reference - (url "https://github.com/samuelcolvin/watchgod") + (url "https://github.com/samuelcolvin/watchfiles") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0zm9xd2qf3d74l67yv8j3zhhhvi0vp25vhkg46l9d7flh9m04qrp")))) - (build-system pyproject-build-system) + (base32 "1kaxq0drjwlvcsg4in25w1bhjjgm1zlz06rr2macyi6s5x96g46h")))) + (build-system cargo-build-system) (arguments - (list #:test-flags '(list "-o" "asyncio_mode=auto" - ;; PytestUnraisableExceptionWarning - "-k" "not test_watch_log and not test_awatch") - #:phases #~(modify-phases %standard-phases - (delete 'sanity-check)))) + (list + #:install-source? #f + #:imported-modules `(,@%cargo-build-system-modules + ,@%pyproject-build-system-modules) + #:modules '((guix build cargo-build-system) + ((guix build pyproject-build-system) #:prefix py:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'build + (assoc-ref py:%standard-phases 'build)) + (add-after 'build 'install-rust-library + (lambda _ + (copy-file "target/release/lib_rust_notify.so" + "watchfiles/_rust_notify.so"))) + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (if tests? + ;; Missing file in source. + (invoke "pytest" "-vv" "-k" "not test_docs_examples") + (format #t "test suite not run~%")))) + (replace 'install + (assoc-ref py:%standard-phases 'install))) + #:cargo-inputs + (list rust-crossbeam-channel-0.5 rust-notify-7 rust-pyo3-0.23))) (native-inputs - (list python-anyio - python-pygments + (list maturin + python-anyio + python-dirty-equals python-pytest - python-pytest-asyncio python-pytest-mock - python-pytest-sugar - python-setuptools - python-wheel)) - (home-page "https://github.com/samuelcolvin/watchgod") + python-pytest-timeout + python-wrapper)) + (home-page "https://github.com/samuelcolvin/watchfiles") (synopsis "Simple, modern file watching and code reload in Python") (description "Simple, modern file watching and code reload in Python inspired by @@ -32493,6 +32513,9 @@ (define-public python-watchgod operating systems and an elegant approach to concurrency using threading.") (license license:expat))) +(define-deprecated/alias python-watchgod python-watchfiles) +(export python-watchgod) + (define-public python-wget (package (name "python-wget")