GNU bug report logs - #69867
[PATCH] gnu: magic-wormhole: Update to 0.13.0.

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 69867 in the body.
You can then email your comments to 69867 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: normalmente <normally_js <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: normalmente <normally_js <at> posteo.net>
Subject: [PATCH] gnu: magic-wormhole: Update to 0.13.0.
Date: Sun, 17 Mar 2024 20:15:06 +0000

* gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0.
[arguments]: Skip tests. Add gexps.

Change-Id: I8502f38d7d0e4bf7a9b03c466c761f5a95157cb2
---
 gnu/packages/magic-wormhole.scm | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index 86a8013aa1..3b02426cd9 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -1,5 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Leo Famulari <leo <at> famulari.name>
+;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
+
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,6 +22,7 @@ (define-module (gnu packages magic-wormhole)
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix licenses)
+  #:use-module (guix gexp)
   #:use-module (guix build-system python)
   #:use-module (gnu packages check)
   #:use-module (gnu packages python-check)
@@ -106,26 +109,27 @@ (define-public magic-wormhole-transit-relay
 (define-public magic-wormhole
   (package
     (name "magic-wormhole")
-    (version "0.12.0")
+    (version "0.13.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "magic-wormhole" version))
         (sha256
          (base32
-          "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"))))
+          "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc"))))
     (build-system python-build-system)
     (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         ;; XXX I can't figure out how to build the docs properly.
-         ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101
-         (add-after 'install 'install-docs
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (man (string-append out "/share/man/man1")))
-               (install-file "docs/wormhole.1" man))
-             #t)))))
+     (list
+      #:tests? #f ; Tests fail due to issue unrelated to dependencies.
+      #:phases
+      #~(modify-phases %standard-phases
+          ;; XXX I can't figure out how to build the docs properly.
+          ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101
+          (add-after 'install 'install-docs
+            (lambda* (#:key outputs #:allow-other-keys)
+              (let* ((out (assoc-ref outputs "out"))
+                     (man (string-append out "/share/man/man1")))
+                (install-file "docs/wormhole.1" man)))))))
     (native-inputs
      (list python-mock
            ;; XXX These are required for the test suite but end up being referenced

base-commit: edfb05e16d409ab71f5cc5c91747b693f0054d59
-- 
2.41.0

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

From: Christopher Baines <mail <at> cbaines.net>
To: normalmente <normally_js <at> posteo.net>
Cc: guix-patches <at> gnu.org, 69867 <at> debbugs.gnu.org
Subject: Re: [bug#69867] [PATCH] gnu: magic-wormhole: Update to 0.13.0.
Date: Wed, 20 Mar 2024 14:49:30 +0000

[Message part 1 (text/plain, inline)]

normalmente <normally_js <at> posteo.net> writes:

> * gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0.
> [arguments]: Skip tests. Add gexps.
>
> Change-Id: I8502f38d7d0e4bf7a9b03c466c761f5a95157cb2
> ---
>  gnu/packages/magic-wormhole.scm | 28 ++++++++++++++++------------
>  1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
> index 86a8013aa1..3b02426cd9 100644
> --- a/gnu/packages/magic-wormhole.scm
> +++ b/gnu/packages/magic-wormhole.scm
> @@ -1,5 +1,7 @@
>  ;;; GNU Guix --- Functional package management for GNU
>  ;;; Copyright © 2019 Leo Famulari <leo <at> famulari.name>
> +;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
> +
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -20,6 +22,7 @@ (define-module (gnu packages magic-wormhole)
>    #:use-module (guix packages)
>    #:use-module (guix download)
>    #:use-module (guix licenses)
> +  #:use-module (guix gexp)
>    #:use-module (guix build-system python)
>    #:use-module (gnu packages check)
>    #:use-module (gnu packages python-check)
> @@ -106,26 +109,27 @@ (define-public magic-wormhole-transit-relay
>  (define-public magic-wormhole
>    (package
>      (name "magic-wormhole")
> -    (version "0.12.0")
> +    (version "0.13.0")
>      (source
>        (origin
>          (method url-fetch)
>          (uri (pypi-uri "magic-wormhole" version))
>          (sha256
>           (base32
> -          "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"))))
> +          "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc"))))
>      (build-system python-build-system)
>      (arguments
> -     '(#:phases
> -       (modify-phases %standard-phases
> -         ;; XXX I can't figure out how to build the docs properly.
> -         ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101
> -         (add-after 'install 'install-docs
> -           (lambda* (#:key outputs #:allow-other-keys)
> -             (let* ((out (assoc-ref outputs "out"))
> -                    (man (string-append out "/share/man/man1")))
> -               (install-file "docs/wormhole.1" man))
> -             #t)))))
> +     (list
> +      #:tests? #f ; Tests fail due to issue unrelated to dependencies.

I don't really understand your comment here, why is the relation to
dependencies relevant?

I did have a look at whether this issue was reported upstream, and it
has been [1], and it looks like the cause/resolution is dependency
related.

1: https://github.com/magic-wormhole/magic-wormhole/issues/500

> +      #:phases
> +      #~(modify-phases %standard-phases
> +          ;; XXX I can't figure out how to build the docs properly.
> +          ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101
> +          (add-after 'install 'install-docs
> +            (lambda* (#:key outputs #:allow-other-keys)
> +              (let* ((out (assoc-ref outputs "out"))
> +                     (man (string-append out "/share/man/man1")))
> +                (install-file "docs/wormhole.1" man)))))))
>      (native-inputs
>       (list python-mock
>             ;; XXX These are required for the test suite but end up being referenced
>
> base-commit: edfb05e16d409ab71f5cc5c91747b693f0054d59

[signature.asc (application/pgp-signature, inline)]

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

From: normalmente <normally_js <at> posteo.net>
To: 69867 <at> debbugs.gnu.org
Cc: mail <at> cbaines.net, normalmente <normally_js <at> posteo.net>
Subject: [PATCH 1/2] gnu: Add python-noiseprotocol.
Date: Wed, 20 Mar 2024 18:55:49 +0000

* gnu/packages/python-web.scm (python-noiseprotocol): New variable.

Change-Id: Id62f22f9fd3f019beded5ce5c0fe9123c34f8bb2
---
 gnu/packages/python-web.scm | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 9ad081beb1..67bc193b4d 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -63,6 +63,7 @@
 ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan <at> selidor.net>
 ;;; Copyright © 2024 Troy Figiel <troy <at> troyfigiel.com>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
+;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3422,6 +3423,24 @@ (define-public python-ndg-httpsclient
     (home-page "https://github.com/cedadev/ndg_httpsclient/")
     (license license:bsd-3)))
 
+(define-public python-noiseprotocol
+  (package
+    (name "python-noiseprotocol")
+    (version "0.3.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "noiseprotocol" version))
+       (sha256
+        (base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh"))))
+    (build-system pyproject-build-system)
+    (propagated-inputs (list python-cryptography))
+    (home-page "https://github.com/plizonczyk/noiseprotocol")
+    (synopsis "Implementation of Noise Protocol Framework")
+    (description
+     "This package provides an implementation of Noise Protocol Framework.")
+    (license license:expat)))
+
 (define-public python-websocket-client
   (package
     (name "python-websocket-client")
-- 
2.41.0

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

From: normalmente <normally_js <at> posteo.net>
To: 69867 <at> debbugs.gnu.org
Cc: mail <at> cbaines.net, normalmente <normally_js <at> posteo.net>
Subject: [PATCH 2/2] gnu: magic-wormhole: Update to 0.13.0.
Date: Wed, 20 Mar 2024 18:55:50 +0000

* gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0.
[native-inputs]: Add python-noiseprotocol to make tests pass.

Change-Id: I59008f27081efcc3b558dad59bef6ebdc9b34f38
---
 gnu/packages/magic-wormhole.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index 86a8013aa1..f9ccf8c1d3 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Leo Famulari <leo <at> famulari.name>
+;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -106,14 +107,14 @@ (define-public magic-wormhole-transit-relay
 (define-public magic-wormhole
   (package
     (name "magic-wormhole")
-    (version "0.12.0")
+    (version "0.13.0")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "magic-wormhole" version))
         (sha256
          (base32
-          "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"))))
+          "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -128,6 +129,7 @@ (define-public magic-wormhole
              #t)))))
     (native-inputs
      (list python-mock
+           python-noiseprotocol
            ;; XXX These are required for the test suite but end up being referenced
            ;; by the built package.
            ;; https://bugs.gnu.org/25235
-- 
2.41.0

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

From: normalmente <normally_js <at> posteo.net>
To: 69867 <at> debbugs.gnu.org
Cc: mail <at> cbaines.net, normalmente <normally_js <at> posteo.net>
Subject: [PATCH 0/2] gnu: magic-wormhole: Update to 0.13.0.
Date: Wed, 20 Mar 2024 18:52:16 +0000

I meant to write "related to" instead of "unrelated," my bad. I looked over
the link you attached to your email and yes all that one needs to do is add
the `python-noiseprotocol' package to make the tests succeed.

I didn't find that so thanks for pointing that out to me. This is a revised patchset.

normalmente (2):
  gnu: Add python-noiseprotocol.
  gnu: magic-wormhole: Update to 0.13.0.

 gnu/packages/magic-wormhole.scm |  6 ++++--
 gnu/packages/python-web.scm     | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)


base-commit: 69951a61a1d8f1f2135ea2dc836738be282b97bc
--
2.41.0

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

From: Tanguy LE CARROUR <tanguy <at> bioneland.org>
To: 69867 <at> debbugs.gnu.org, normalmente <normally_js <at> posteo.net>
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 normalmente <normally_js <at> posteo.net>, Munyoki Kilyungi <me <at> bonfacemunyoki.com>,
 mail <at> cbaines.net, Lars-Dominik Braun <lars <at> 6xq.net>, jgart <jgart <at> dismail.de>,
 Marius Bakke <marius <at> gnu.org>
Subject: Re: [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol.
Date: Thu, 21 Mar 2024 09:41:15 +0100

Hi normalmente,

Quoting normalmente (2024-03-20 19:55:49)
> * gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0.
> [arguments]: Skip tests. Add gexps.
>
> Change-Id: I8502f38d7d0e4bf7a9b03c466c761f5a95157cb2
> […]
> * gnu/packages/python-web.scm (python-noiseprotocol): New variable.
> 
> Change-Id: Id62f22f9fd3f019beded5ce5c0fe9123c34f8bb2

This looks good to me.
It might be worth disabling only the one failing test, though!?

Regards,

-- 
Tanguy

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

From: normally_js <normally_js <at> posteo.net>
To: Tanguy LE CARROUR <tanguy <at> bioneland.org>, 69867 <at> debbugs.gnu.org
Subject: Re: [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol.
Date: Thu, 21 Mar 2024 18:59:15 +0000

Short answer: I don't know how to disable specific tests within the 
python-build-system, but since we already have a solution that works it 
likely doesn't matter.

But I'd assume that getting tests to pass is better than being forced to 
disable them and python-team should *not* be affected by this addition.

---

normalmente

On 3/21/24 04:41, Tanguy LE CARROUR wrote:
> Hi normalmente,
>
> Quoting normalmente (2024-03-20 19:55:49)
>> * gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0.
>> [arguments]: Skip tests. Add gexps.
>>
>> Change-Id: I8502f38d7d0e4bf7a9b03c466c761f5a95157cb2
>> […]
>> * gnu/packages/python-web.scm (python-noiseprotocol): New variable.
>>
>> Change-Id: Id62f22f9fd3f019beded5ce5c0fe9123c34f8bb2
> This looks good to me.
> It might be worth disabling only the one failing test, though!?
>
> Regards,
>

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

From: Tanguy LE CARROUR <tanguy <at> bioneland.org>
To: 69867 <at> debbugs.gnu.org, normally_js <normally_js <at> posteo.net>
Subject: Re: [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol.
Date: Fri, 22 Mar 2024 10:32:39 +0100

Hi,


Quoting normally_js (2024-03-21 19:59:15)
> Short answer: I don't know how to disable specific tests within the 
> python-build-system, but since we already have a solution that works it 
> likely doesn't matter.
> But I'd assume that getting tests to pass is better than being forced to 
> disable them and python-team should *not* be affected by this addition.

My bad! I should have suggested the code snippet to disable it!
As the error message is:

```
ERROR: test_large_frame (wormhole.test.dilate.test_record.Record)
Noise only allows 64KiB message, but the API allows up to 4GiB
----------------------------------------------------------------------
Traceback (most recent call last):
[…]
  File "/tmp/guix-build-magic-wormhole-0.13.0.drv-0/magic-wormhole-0.13.0/src/wormhole/_dilation/connector.py", line 45, in build_noise
    return NoiseConnection.from_name(NOISEPROTO)
AttributeError: 'NoneType' object has no attribute 'from_name'
```

… the failing test is `test_large_frame`. You can disable it the same way
it is done in, for instance, `magic-wormhole-mailbox-server`:

```scheme
    (arguments
     '(#:phases
       (modify-phases %standard-phases
         (add-after 'unpack 'disable-some-tests
          (lambda _
            (substitute* "src/wormhole/_dilation/connector.py"
              (("test_large_frame") "disabled_test_large_frame"))
            #t)))))
```

But, actually, the problem comes from the fact that the `noise` module
is not available. You must add `python-noiseprotocol` as an input to the
package. Either as a native input for the test to pass, or, if it make
sense, as a propagated input for it to be available at run time.
Hence, the patch adding `python-noiseprotocol` should come before the one
updating `magic-wormhole`.

Regards,

-- 
Tanguy

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

From: Sharlatan Hellseher <sharlatanus <at> gmail.com>
To: 69867-done <at> debbugs.gnu.org
Subject: [PATCH] gnu: magic-wormhole: Update to 0.13.0.
Date: Sat, 23 Mar 2024 21:03:44 +0000

[Message part 1 (text/plain, inline)]

Hi,

I've pushed 2 patches as fd579def37..68455ddf4b to master.

As the whole modules contains just 3 packages so I've applied some
refactoring:

- 28bc0e870b * gnu: magic-wormhole: Fix home page.
- edf7bd05e1 * gnu: magic-wormhole-transit-relay: Remove some native inputs.
- 7c11136764 * gnu: magic-wormhole-transit-relay: Fix indentation.
- b877fead3b * gnu: magic-wormhole-mailbox-server: Fix indentation.
- 8444c7b0dc * gnu: magic-wormhole: Limit amount of loaded symbols.
- 70386806e1 * gnu: magic-wormhole-transit-relay: Simplify package.
- 9972487417 * gnu: magic-wormhole-mailbox-server: Simplify package.
- 3b43d01c61 * gnu: magic-wormhole: Add licenses prefix.
- d72fe75367 * gnu: magic-wormhole: Fix indentation.
- fb667a7a8a * gnu: magic-wormhole: Simplify package.

Thanks,
Oleg

[signature.asc (application/pgp-signature, inline)]

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

From: Munyoki Kilyungi <me <at> bonfacemunyoki.com>
To: normalmente <normally_js <at> posteo.net>, 69867 <at> debbugs.gnu.org
Cc: Sharlatan Hellseher <sharlatanus <at> gmail.com>,
 normalmente <normally_js <at> posteo.net>, mail <at> cbaines.net,
 Lars-Dominik Braun <lars <at> 6xq.net>, jgart <jgart <at> dismail.de>,
 Marius Bakke <marius <at> gnu.org>, Tanguy Le Carrour <tanguy <at> bioneland.org>
Subject: Re: [bug#69867] [PATCH 1/2] gnu: Add python-noiseprotocol.
Date: Sun, 24 Mar 2024 22:43:07 +0300

[Message part 1 (text/plain, inline)]

Tested this myself and it builds just fine.  +1.

normalmente <normally_js <at> posteo.net> anaandika:

> * gnu/packages/python-web.scm (python-noiseprotocol): New variable.
>
> Change-Id: Id62f22f9fd3f019beded5ce5c0fe9123c34f8bb2
> ---
>  gnu/packages/python-web.scm | 19 +++++++++++++++++++
>  1 file changed, 19 insertions(+)
>
> diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
> index 9ad081beb1..67bc193b4d 100644
> --- a/gnu/packages/python-web.scm
> +++ b/gnu/packages/python-web.scm
> @@ -63,6 +63,7 @@
>  ;;; Copyright © 2023 Ivan Vilata-i-Balaguer <ivan <at> selidor.net>
>  ;;; Copyright © 2024 Troy Figiel <troy <at> troyfigiel.com>
>  ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus <at> gmail.com>
> +;;; Copyright © 2024 normally_js <normally_js <at> posteo.net>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -3422,6 +3423,24 @@ (define-public python-ndg-httpsclient
>      (home-page "https://github.com/cedadev/ndg_httpsclient/")
>      (license license:bsd-3)))
>  
> +(define-public python-noiseprotocol
> +  (package
> +    (name "python-noiseprotocol")
> +    (version "0.3.1")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "noiseprotocol" version))
> +       (sha256
> +        (base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh"))))
> +    (build-system pyproject-build-system)
> +    (propagated-inputs (list python-cryptography))
> +    (home-page "https://github.com/plizonczyk/noiseprotocol")
> +    (synopsis "Implementation of Noise Protocol Framework")
> +    (description
> +     "This package provides an implementation of Noise Protocol Framework.")
> +    (license license:expat)))
> +
>  (define-public python-websocket-client
>    (package
>      (name "python-websocket-client")
> -- 
> 2.41.0
>
>
>

-- 
(Life is like a pencil that will surely run out,
    but will leave the beautiful writing of life.)
(D4F09EB110177E03C28E2FE1F5BBAE1E0392253F
    (hkp://keys.openpgp.org))

[signature.asc (application/pgp-signature, inline)]

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

From: Dale Mellor <guix-devel-0brg6a <at> rdmp.org>
To: 69867 <at> debbugs.gnu.org
Subject: Close: current Guix already has successor version (0.14.0) of this
 package
Date: Sun, 14 Apr 2024 20:42:11 +0100

Previous Next

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