GNU bug report logs - #76436
[PATCH python-team 0/3] Update and rename python-watchgod

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 76436 in the body.
You can then email your comments to 76436 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Subject: [PATCH python-team 0/3] Update and rename python-watchgod
Date: Thu, 20 Feb 2025 09:01:50 +0100

Nicolas Graves (3):
  gnu: Add rust-notify-types-1.
  gnu: Add rust-notify-7.
  gnu: python-watchgod: Rename package to python-watchfiles.

 gnu/packages/crates-io.scm  | 68 +++++++++++++++++++++++++++++++++----
 gnu/packages/python-xyz.scm | 58 +++++++++++++++++++++----------
 2 files changed, 101 insertions(+), 25 deletions(-)

-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #8 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team 1/3] gnu: Add rust-notify-types-1.
Date: Wed, 19 Feb 2025 23:30:49 +0100

* gnu/packages/crates-io.scm (rust-notify-types-1): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9bbc8a93b3..ce284ffcfe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47492,6 +47492,29 @@ (define-public rust-notify-rust-4
 Rust dbus client and server.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-notify-types-1
+  (package
+    (name "rust-notify-types")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notify-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x5idrpxzf70ng88rz28dqmgx1jyddf0vxx1x3csw09fw6skqpaq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-instant" ,rust-instant-0.1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-insta" ,rust-insta-1)
+                                   ("rust-rstest" ,rust-rstest-0.21)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/notify-rs/notify")
+    (synopsis "Types used by the notify crate")
+    (description "This package provides rust types used by the notify crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-notmuch-0.8
   (package
     (name "rust-notmuch")
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #11 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team 2/3] gnu: Add rust-notify-7.
Date: Wed, 19 Feb 2025 23:31:28 +0100

* gnu/packages/crates-io.scm (rust-notify-7): New variable.
(rust-notify-6): Inherit from rust-notify-7.
---
 gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce284ffcfe..21809ec22b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47297,8 +47297,45 @@ (define-public rust-normpath-0.2
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-notify-7
+  (package
+    (name "rust-notify")
+    (version "7.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notify" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02a0a1n0raxqslwhfprwmz7w34v54r42006q0m8bmy89jz1v8cy5"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:cargo-inputs (list rust-bitflags-2
+                           rust-crossbeam-channel-0.5
+                           rust-filetime-0.2
+                           rust-fsevent-sys-4
+                           rust-inotify-0.10
+                           rust-kqueue-1
+                           rust-libc-0.2
+                           rust-log-0.4
+                           rust-mio-1
+                           rust-notify-types-1
+                           rust-walkdir-2
+                           rust-windows-sys-0.52)
+      #:cargo-development-inputs (list rust-insta-1
+                                       rust-nix-0.27
+                                       rust-serde-json-1
+                                       rust-tempfile-3)))
+    (home-page "https://github.com/notify-rs/notify")
+    (synopsis "Cross-platform filesystem notification library")
+    (description "This package contains a cross-platform filesystem
+notification library.")
+    (license license:cc0)))
+
 (define-public rust-notify-6
   (package
+    (inherit rust-notify-7)
     (name "rust-notify")
     (version "6.1.1")
     (source
@@ -47308,7 +47345,6 @@ (define-public rust-notify-6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0bad98r0ilkhhq2jg3zs11zcqasgbvxia8224wpasm74n65vs1b2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
                        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
@@ -47324,12 +47360,7 @@ (define-public rust-notify-6
                        ("rust-windows-sys" ,rust-windows-sys-0.48))
        #:cargo-development-inputs (("rust-nix" ,rust-nix-0.23)
                                    ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/notify-rs/notify")
-    (synopsis "Cross-platform filesystem notification library")
-    (description "This package contains a cross-platform filesystem
-notification library.")
-    (license license:cc0)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-notify-5
   (package
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #14 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team 3/3] gnu: python-watchgod: Rename package to
 python-watchfiles.
Date: Thu, 20 Feb 2025 08:53:26 +0100

* 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 | 58 +++++++++++++++++++++++++------------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index f738b2b00c..2d86cc010a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -32455,37 +32455,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 +32512,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")
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #17 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team v2 1/4] gnu: Add rust-notify-types-1.
Date: Wed, 19 Feb 2025 23:30:49 +0100

* gnu/packages/crates-io.scm (rust-notify-types-1): New variable.
---
 gnu/packages/crates-io.scm | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index 9bbc8a93b3..ce284ffcfe 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47492,6 +47492,29 @@ (define-public rust-notify-rust-4
 Rust dbus client and server.")
     (license (list license:expat license:asl2.0))))
 
+(define-public rust-notify-types-1
+  (package
+    (name "rust-notify-types")
+    (version "1.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notify-types" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "0x5idrpxzf70ng88rz28dqmgx1jyddf0vxx1x3csw09fw6skqpaq"))))
+    (build-system cargo-build-system)
+    (arguments
+     `(#:cargo-inputs (("rust-instant" ,rust-instant-0.1)
+                       ("rust-serde" ,rust-serde-1))
+       #:cargo-development-inputs (("rust-insta" ,rust-insta-1)
+                                   ("rust-rstest" ,rust-rstest-0.21)
+                                   ("rust-serde-json" ,rust-serde-json-1))))
+    (home-page "https://github.com/notify-rs/notify")
+    (synopsis "Types used by the notify crate")
+    (description "This package provides rust types used by the notify crate.")
+    (license (list license:expat license:asl2.0))))
+
 (define-public rust-notmuch-0.8
   (package
     (name "rust-notmuch")
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #20 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team v2 2/4] gnu: Add rust-notify-7.
Date: Wed, 19 Feb 2025 23:31:28 +0100

* gnu/packages/crates-io.scm (rust-notify-7): New variable.
(rust-notify-6): Inherit from rust-notify-7.
---
 gnu/packages/crates-io.scm | 45 ++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm
index ce284ffcfe..21809ec22b 100644
--- a/gnu/packages/crates-io.scm
+++ b/gnu/packages/crates-io.scm
@@ -47297,8 +47297,45 @@ (define-public rust-normpath-0.2
         ("rust-rustversion" ,rust-rustversion-1)
         ("rust-tempfile" ,rust-tempfile-3))))))
 
+(define-public rust-notify-7
+  (package
+    (name "rust-notify")
+    (version "7.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (crate-uri "notify" version))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32 "02a0a1n0raxqslwhfprwmz7w34v54r42006q0m8bmy89jz1v8cy5"))))
+    (build-system cargo-build-system)
+    (arguments
+     (list
+      #:cargo-inputs (list rust-bitflags-2
+                           rust-crossbeam-channel-0.5
+                           rust-filetime-0.2
+                           rust-fsevent-sys-4
+                           rust-inotify-0.10
+                           rust-kqueue-1
+                           rust-libc-0.2
+                           rust-log-0.4
+                           rust-mio-1
+                           rust-notify-types-1
+                           rust-walkdir-2
+                           rust-windows-sys-0.52)
+      #:cargo-development-inputs (list rust-insta-1
+                                       rust-nix-0.27
+                                       rust-serde-json-1
+                                       rust-tempfile-3)))
+    (home-page "https://github.com/notify-rs/notify")
+    (synopsis "Cross-platform filesystem notification library")
+    (description "This package contains a cross-platform filesystem
+notification library.")
+    (license license:cc0)))
+
 (define-public rust-notify-6
   (package
+    (inherit rust-notify-7)
     (name "rust-notify")
     (version "6.1.1")
     (source
@@ -47308,7 +47345,6 @@ (define-public rust-notify-6
        (file-name (string-append name "-" version ".tar.gz"))
        (sha256
         (base32 "0bad98r0ilkhhq2jg3zs11zcqasgbvxia8224wpasm74n65vs1b2"))))
-    (build-system cargo-build-system)
     (arguments
      `(#:cargo-inputs (("rust-bitflags" ,rust-bitflags-2)
                        ("rust-crossbeam-channel" ,rust-crossbeam-channel-0.5)
@@ -47324,12 +47360,7 @@ (define-public rust-notify-6
                        ("rust-windows-sys" ,rust-windows-sys-0.48))
        #:cargo-development-inputs (("rust-nix" ,rust-nix-0.23)
                                    ("rust-serde-json" ,rust-serde-json-1)
-                                   ("rust-tempfile" ,rust-tempfile-3))))
-    (home-page "https://github.com/notify-rs/notify")
-    (synopsis "Cross-platform filesystem notification library")
-    (description "This package contains a cross-platform filesystem
-notification library.")
-    (license license:cc0)))
+                                   ("rust-tempfile" ,rust-tempfile-3))))))
 
 (define-public rust-notify-5
   (package
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #23 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team v2 3/4] gnu: python-watchgod: Rename package to
 python-watchfiles.
Date: Thu, 20 Feb 2025 08:53:26 +0100

* 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")
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #26 received at 76436 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 76436 <at> debbugs.gnu.org
Subject: [PATCH python-team v2 4/4] gnu: python-uvicorn: Rename
 python-watchgod native-input.
Date: Thu, 20 Feb 2025 09:34:15 +0100

* gnu/packages/python-web.scm (python-uvicorn)[native-inputs]: Rename
python-watchgod to python-watchfiles. Add python-a2wsgi.
---
 gnu/packages/python-web.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 27452efdb7..5bed528e95 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -7367,13 +7367,14 @@ (define-public python-uvicorn
            python-trustme
            python-wsproto))
     (propagated-inputs
-     (list python-click
+     (list python-a2wsgi
+           python-click
            python-dotenv
            python-h11
            python-httptools
            python-pyyaml
            python-uvloop
-           python-watchgod
+           python-watchfiles
            python-websockets))
     (home-page "https://github.com/encode/uvicorn")
     (synopsis "Fast ASGI server implementation")
-- 
2.48.1



-- 
Best regards,
Nicolas Graves

Message #33 received at 76436-done <at> debbugs.gnu.org (full text, mbox):

From: Ricardo Wurmus <rekado <at> elephly.net>
To: 76436-done <at> debbugs.gnu.org
Subject: [PATCH python-team v2 4/4] gnu: python-uvicorn: Rename
 python-watchgod native-input.
Date: Wed, 26 Feb 2025 14:06:23 +0100

I've applied it on the python-team branch (ending with commit
f4f82ca7dc0b22ba2b7cc338ffe655915abf95aa).

Thank you!

-- 
Ricardo

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.