[bug#34515] Magic-Wormhole

[bug#34515] Magic-Wormhole

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 251 bytes --]

These patches add Magic-Wormhole and its dependencies.

https://magic-wormhole.readthedocs.io/en/latest/

I tested that there are no new build failures after the update of
Twisted. This update is required to build the Magic-Wormhole dependency
graph.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 01/13] gnu: Add python-humanize.

[Leo Famulari]

* gnu/packages/python-xyz.scm (python-humanize): New variable.
---
 gnu/packages/python-xyz.scm | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 811cbaf03e..decfb01117 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2015, 2016 Christopher Allan Webber <cwebber@dustycloud.org>
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
-;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
 ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
@@ -15044,3 +15044,24 @@ It features bit and byte granularity, easy debugging and testing, an
 easy-to-extend subclass system, and lots of primitive constructs to
 make your work easier.")
     (license license:expat)))
+
+(define-public python-humanize
+  (package
+    (name "python-humanize")
+    (version "0.5.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "humanize" version))
+        (sha256
+         (base32
+          "06dvhm3k8lf2rayn1gxbd46y0fy1db26m3h9vrq7rb1ib08mfgx4"))))
+    (arguments
+     '(#:tests? #f)) ; tests not in pypi archive
+    (build-system python-build-system)
+    (home-page "https://github.com/jmoiron/humanize")
+    (synopsis "Print numerical information in a human-readable form")
+    (description "This package provides a Python module that displays numbers
+and dates in \"human readable\" forms.  For example, it would display
+\"12345591313\" as \"12.3 billion\".")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 02/13] gnu: Add python-txaio.

[Leo Famulari]

* gnu/packages/python-xyz.scm (python-txaio): New variable.
---
 gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index decfb01117..745569c14a 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -15065,3 +15065,24 @@ make your work easier.")
 and dates in \"human readable\" forms.  For example, it would display
 \"12345591313\" as \"12.3 billion\".")
     (license license:expat)))
+
+(define-public python-txaio
+  (package
+    (name "python-txaio")
+    (version "18.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "txaio" version))
+        (sha256
+         (base32
+          "1zmpdph6zddgrnkkcykh6qk5s46l7s5mzfqrh82m4b5iffn61qv7"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-twisted" ,python-twisted)
+       ("python-six" ,python-six)))
+    (home-page "https://github.com/crossbario/txaio")
+    (synopsis "Compatibility layer between Python asyncio and Twisted")
+    (description "Txaio provides a compatibility layer between the Python
+@code{asyncio} module and @code{Twisted}.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 03/13] gnu: Add python-hyperlink.

[Leo Famulari]

* gnu/packages/python-web.scm (python-hyperlink): New variable.
---
 gnu/packages/python-web.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index dce8dd2ae9..052331cc44 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -12,7 +12,7 @@
 ;;; Copyright © 2014, 2017 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Cyril Roelandt <tipecaml@gmail.com>
-;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2016, 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2015, 2017 Ben Woodcroft <donttrustben@gmail.com>
@@ -2953,3 +2953,23 @@ underlies Mozilla Persona.")
      "This is a Python library for interacting with the Firefox Accounts
 ecosystem.")
     (license license:mpl2.0)))
+
+(define-public python-hyperlink
+  (package
+    (name "python-hyperlink")
+    (version "18.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "hyperlink" version))
+        (sha256
+         (base32
+          "01m3y19arfqljksngy8grc966zdb4larysralb8cajzi8kvly6zh"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-idna" ,python-idna)))
+    (home-page "https://github.com/python-hyper/hyperlink")
+    (synopsis "Python module to create immutable URLs according to spec")
+    (description "This package provides a Python module to create immutable, and
+correct URLs for Python according to RFCs 3986 and 3987.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 04/13] gnu: python-txamqp: Depend on python-hyperlink.

[Leo Famulari]

* gnu/packages/python-xyz.scm (python-txamqp,
python2-txamqp)[propagated-inputs]: Add python-hyperlink.
---
 gnu/packages/python-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 745569c14a..effaea1dcf 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -8158,6 +8158,7 @@ alternative when librabbitmq is not available.")
     (build-system python-build-system)
     (propagated-inputs
      `(("python-six" ,python-six)
+       ("python-hyperlink" ,python-hyperlink)
        ("python-twisted" ,python-twisted)))
     (home-page "https://github.com/txamqp/txamqp")
     (synopsis "Communicate with AMQP peers and brokers using Twisted")
-- 
2.20.1

[bug#34515] [PATCH 05/13] gnu: python-twisted: Update to 17.5.0

[Leo Famulari]

* gnu/packages/python-xyz.scm (python-twisted, python2-twisted): Update
to 17.5.0.
---
 gnu/packages/python-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index effaea1dcf..d1348b22f2 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -9233,13 +9233,13 @@ format.")
 (define-public python-twisted
   (package
     (name "python-twisted")
-    (version "17.1.0")
+    (version "17.5.0")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "Twisted" version ".tar.bz2"))
               (sha256
                (base32
-                "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv"))))
+                "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i"))))
     (build-system python-build-system)
     (arguments
      '(#:tests? #f)) ; FIXME: Some tests are failing.
-- 
2.20.1

[bug#34515] [PATCH 06/13] gnu: Add python-treq.

[Leo Famulari]

* gnu/packages/python-web.scm (python-treq): New variable.
---
 gnu/packages/python-web.scm | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 052331cc44..e54f09ddb4 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -2973,3 +2973,30 @@ ecosystem.")
     (description "This package provides a Python module to create immutable, and
 correct URLs for Python according to RFCs 3986 and 3987.")
     (license license:expat)))
+
+(define-public python-treq
+  (package
+    (name "python-treq")
+    (version "18.6.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "treq" version))
+        (sha256
+         (base32
+          "0j4zwq9p1c9piv1vc66nxcv9s6hdinf90jwkbsm91k14npv9zq4i"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-attrs" ,python-attrs)
+       ("python-hyperlink" ,python-hyperlink)
+       ("python-idna" ,python-idna)
+       ("python-incremental" ,python-incremental)
+       ("python-requests" ,python-requests)
+       ("python-service-identity" ,python-service-identity)
+       ("python-twisted" ,python-twisted)))
+    (home-page "https://github.com/twisted/treq")
+    (synopsis "Requests-like API built on top of twisted.web's Agent")
+    (description "This package provides an HTTP library inspired by
+@code{requests}} but written on top of @code{Twisted's} Agents.  It offers a
+high level API for making HTTP requests when using Twisted.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 07/13] gnu: Add python-hkdf.

[Leo Famulari]

* gnu/packages/python-crypto.scm (python-hkdf): New variable.
---
 gnu/packages/python-crypto.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index bcafd154e7..29e0ee5951 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2015 Eric Dvorsak <eric@dvorsak.fr>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
-;;; Copyright © 2015, 2016, 2017 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2015, 2016, 2017, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017 Ben Sturmfels <ben@sturm.com.au>
 ;;; Copyright © 2016 Sou Bunnbu <iyzsong@gmail.com>
@@ -996,3 +996,23 @@ relevant RFCs too.")
 
 (define-public python2-service-identity
   (package-with-python2 python-service-identity))
+
+(define-public python-hkdf
+  (package
+    (name "python-hkdf")
+    (version "0.0.3")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "hkdf" version))
+        (sha256
+         (base32
+          "1jhxk5vhxmxxjp3zj526ry521v9inzzl8jqaaf0ma65w6k332ak2"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-nose" ,python-nose)))
+    (home-page "https://github.com/casebeer/python-hkdf")
+    (synopsis "HMAC-based Extract-and-Expand Key Derivation Function (HKDF)")
+    (description "This package provides a Python implementation of the HMAC Key
+Derivation function (HKDF) defined in RFC 5869.")
+    (license license:bsd-2)))
-- 
2.20.1

[bug#34515] [PATCH 08/13] gnu: Add python-spake2.

[Leo Famulari]

* gnu/packages/python-crypto.scm (python-spake2): New variable.
---
 gnu/packages/python-crypto.scm | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 29e0ee5951..6ca82cb061 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1016,3 +1016,23 @@ relevant RFCs too.")
     (description "This package provides a Python implementation of the HMAC Key
 Derivation function (HKDF) defined in RFC 5869.")
     (license license:bsd-2)))
+
+(define-public python-spake2
+  (package
+    (name "python-spake2")
+    (version "0.8")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "spake2" version))
+        (sha256
+         (base32
+          "1x16r7lrbklvfzbacb66qv9iiih6liq1y612dqh2chgf555n2yn1"))))
+    (build-system python-build-system)
+    (propagated-inputs
+     `(("python-hkdf" ,python-hkdf)))
+    (home-page "https://github.com/warner/python-spake2")
+    (synopsis "SPAKE2 password-authenticated key exchange in Python")
+    (description "This package provides a Python implementation of the SPAKE2
+Password-Authenticated Key Exchange algorithm.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 09/13] gnu: Add python-txtorcon.

[Leo Famulari]

* gnu/packages/python-crypto.scm (python-txtorcon): New variable.
---
 gnu/packages/python-crypto.scm | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index 6ca82cb061..a944ee9662 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1036,3 +1036,32 @@ Derivation function (HKDF) defined in RFC 5869.")
     (description "This package provides a Python implementation of the SPAKE2
 Password-Authenticated Key Exchange algorithm.")
     (license license:expat)))
+
+(define-public python-txtorcon
+  (package
+    (name "python-txtorcon")
+    (version "19.0.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "txtorcon" version))
+        (sha256
+         (base32
+          "0fxzhsc62bhmr730vj9pzallmw56gz6iykvl28a5agrycm0bfc9p"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; fail silently
+    (propagated-inputs
+     `(("python-automat" ,python-automat)
+       ("python-hyperlink" ,python-hyperlink)
+       ("python-idna" ,python-idna)
+       ("python-incremental" ,python-incremental)
+       ("python-ipaddress" ,python-ipaddress)
+       ("python-service-identity" ,python-service-identity)
+       ("python-twisted" ,python-twisted)
+       ("python-zope-interface" ,python-zope-interface)))
+    (home-page "https://github.com/meejah/txtorcon")
+    (synopsis "Twisted-based Tor controller client")
+    (description "This package provides a Twisted-based Tor controller client,
+with state-tracking and configuration abstractions.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 10/13] gnu: Add python-autobahn.

[Leo Famulari]

* gnu/packages/python-web.scm (python-autobahn): New variable.
---
 gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index e54f09ddb4..b2b6daee51 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -56,6 +56,7 @@
   #:use-module (gnu packages curl)
   #:use-module (gnu packages databases)
   #:use-module (gnu packages django)
+  #:use-module (gnu packages libffi)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-crypto)
@@ -3000,3 +3001,30 @@ correct URLs for Python according to RFCs 3986 and 3987.")
 @code{requests}} but written on top of @code{Twisted's} Agents.  It offers a
 high level API for making HTTP requests when using Twisted.")
     (license license:expat)))
+
+(define-public python-autobahn
+  (package
+    (name "python-autobahn")
+    (version "19.2.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "autobahn" version))
+        (sha256
+         (base32
+          "1mm7j24ls01c7jb1ad5p5cpyxvzgydiyf8b04ihykh2v8g98j0x7"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:tests? #f)) ; fail mysteriously
+    (propagated-inputs
+     `(("python-cffi" ,python-cffi)
+       ("python-twisted" ,python-twisted)
+       ("python-txaio" ,python-txaio)))
+    (home-page "https://crossbar.io/autobahn/")
+    (synopsis "Web Application Messaging Protocol implementation")
+    (description "This package provides an implementation of the @dfn{Web Application
+Messaging Protocol} (WAMP).  WAMP connects components in distributed
+applications using Publish and Subscribe (PubSub) and routed Remote Procedure
+Calls (rRPC).  It is ideal for distributed, multi-client and server applications
+such as IoT applications or multi-user database-driven business applications.")
+    (license license:expat)))
-- 
2.20.1

[bug#34515] [PATCH 11/13] gnu: Add magic-wormhole-mailbox-server.

[Leo Famulari]

* gnu/packages/magic-wormhole.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk                    |  1 +
 gnu/packages/magic-wormhole.scm | 59 +++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 gnu/packages/magic-wormhole.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index ce43db3c1d..4c570b9e5f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -296,6 +296,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/m4.scm				\
   %D%/packages/machine-learning.scm		\
   %D%/packages/man.scm				\
+  %D%/packages/magic-wormhole.scm		\
   %D%/packages/mail.scm				\
   %D%/packages/make-bootstrap.scm		\
   %D%/packages/markup.scm			\
diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
new file mode 100644
index 0000000000..fd38fba0e8
--- /dev/null
+++ b/gnu/packages/magic-wormhole.scm
@@ -0,0 +1,59 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages magic-wormhole)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix licenses)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages python-crypto)
+  #:use-module (gnu packages python-web)
+  #:use-module (gnu packages python-xyz))
+
+(define-public magic-wormhole-mailbox-server
+  (package
+    (name "magic-wormhole-mailbox-server")
+    (version "0.3.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "magic-wormhole-mailbox-server" version))
+        (sha256
+         (base32
+          "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55"))))
+    (build-system python-build-system)
+    (arguments
+      ;; Tests seem to be Python 2 only...
+      ;; "TypeError: a bytes-like object is required, not 'str'"
+     '(#:tests? #f))
+    (propagated-inputs
+     `(("python-attrs" ,python-attrs)
+       ("python-autobahn" ,python-autobahn)
+       ("python-hyperlink" ,python-hyperlink)
+       ("python-idna" ,python-idna)
+       ("python-service-identity" ,python-service-identity)
+       ("python-six" ,python-six)
+       ("python-treq" ,python-treq)
+       ("python-twisted" ,python-twisted)))
+    (home-page "https://github.com/warner/magic-wormhole-mailbox-server")
+    (synopsis "Magic-Wormhole central server")
+    (description "This package provides the main server that Magic-Wormhole
+clients connect to.  The server performs store-and-forward delivery for small
+key-exchange and control messages.  Bulk data is sent over a direct TCP
+connection, or through a transit-relay.")
+   (license expat)))
-- 
2.20.1

[bug#34515] [PATCH 12/13] gnu: Add magic-wormhole-transit-relay.

[Leo Famulari]

* gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): New variable.
---
 gnu/packages/magic-wormhole.scm | 42 +++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index fd38fba0e8..cc97fec3f9 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -21,6 +21,7 @@
   #:use-module (guix download)
   #:use-module (guix licenses)
   #:use-module (guix build-system python)
+  #:use-module (gnu packages check)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz))
@@ -57,3 +58,44 @@ clients connect to.  The server performs store-and-forward delivery for small
 key-exchange and control messages.  Bulk data is sent over a direct TCP
 connection, or through a transit-relay.")
    (license expat)))
+
+(define-public magic-wormhole-transit-relay
+  (package
+    (name "magic-wormhole-transit-relay")
+    (version "0.1.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "magic-wormhole-transit-relay" version))
+        (sha256
+         (base32
+          "11w5gdc6am2ph5rns60x0694sx4zrlzxj540jljhn5cmnbx1ngxi"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'install-docs
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (docs (string-append out "/share/doc/magic-wormhole-transit-relay")))
+               (for-each (lambda (file)
+                           (install-file file docs))
+                         (find-files "docs/"))
+               #t))))))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-pyflakes" ,python-pyflakes)
+       ("python-tox" ,python-tox)))
+    (propagated-inputs
+     `(("python-hyperlink" ,python-hyperlink)
+       ("python-twisted" ,python-twisted)))
+    (home-page
+      "https://github.com/warner/magic-wormhole-transit-relay")
+    (synopsis "Magic-Wormhole relay server")
+    (description "This package provides the Magic-Wormhole Transit Relay
+server, which helps clients establish bulk-data transit connections even when
+both are behind NAT boxes.  Each side makes a TCP connection to this server and
+presents a handshake.  Two connections with identical handshakes are glued
+together, allowing them to pretend they have a direct connection.")
+    (license expat)))
+
-- 
2.20.1

[bug#34515] [PATCH 13/13] gnu: Add Magic-Wormhole.

[Leo Famulari]

* gnu/packages/magic-wormhole.scm (magic-wormhole): New variable.
---
 gnu/packages/magic-wormhole.scm | 53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index cc97fec3f9..b1aec5ad9c 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -99,3 +99,56 @@ presents a handshake.  Two connections with identical handshakes are glued
 together, allowing them to pretend they have a direct connection.")
     (license expat)))
 
+(define-public magic-wormhole
+  (package
+    (name "magic-wormhole")
+    (version "0.11.2")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "magic-wormhole" version))
+        (sha256
+         (base32
+          "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         ;; XXX I can't figure out how to build the docs properly.
+         (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)))))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ;; XXX These are required for the test suite but end up being referenced
+       ;; by the built package.
+       ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
+       ("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay)))
+    (propagated-inputs
+     `(("python-autobahn" ,python-autobahn)
+       ("python-click" ,python-click)
+       ("python-hkdf" ,python-hkdf)
+       ("python-humanize" ,python-humanize)
+       ("python-hyperlink" ,python-hyperlink)
+       ("python-pynacl" ,python-pynacl)
+       ("python-spake2" ,python-spake2)
+       ("python-tqdm" ,python-tqdm)
+       ("python-twisted" ,python-twisted)
+       ("python-txtorcon" ,python-txtorcon)))
+    (home-page "https://github.com/warner/magic-wormhole")
+    (synopsis "Securely transfer data between computers")
+    (description "Magic-Wormhole is a library and a command-line tool named
+wormhole, which makes it possible to securely transfer arbitrary-sized files and
+directories (or short pieces of text) from one computer to another.  The two
+endpoints are identified by using identical \"wormhole codes\": in general, the
+sending machine generates and displays the code, which must then be typed into
+the receiving machine.
+
+The codes are short and human-pronounceable, using a phonetically-distinct
+wordlist.  The receiving side offers tab-completion on the codewords, so usually
+only a few characters must be typed.  Wormhole codes are single-use and do not
+need to be memorized.")
+    (license expat)))
-- 
2.20.1

[bug#34515] [PATCH 01/13] gnu: Add python-humanize.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-xyz.scm (python-humanize): New variable.

LGTM!

-- 
Ricardo

[bug#34515] [PATCH 02/13] gnu: Add python-txaio.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-xyz.scm (python-txaio): New variable.

LGTM!

-- 
Ricardo

[bug#34515] [PATCH 03/13] gnu: Add python-hyperlink.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

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

LGTM.

-- 
Ricardo

[bug#34515] [PATCH 04/13] gnu: python-txamqp: Depend on python-hyperlink.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-xyz.scm (python-txamqp,
> python2-txamqp)[propagated-inputs]: Add python-hyperlink.
> ---
>  gnu/packages/python-xyz.scm | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 745569c14a..effaea1dcf 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -8158,6 +8158,7 @@ alternative when librabbitmq is not available.")
>      (build-system python-build-system)
>      (propagated-inputs
>       `(("python-six" ,python-six)
> +       ("python-hyperlink" ,python-hyperlink)
>         ("python-twisted" ,python-twisted)))
>      (home-page "https://github.com/txamqp/txamqp")
>      (synopsis "Communicate with AMQP peers and brokers using Twisted")

How can we tell that txamqp really requires hyperlink?  I haven’t been
able to find a reference to hyperlink in the txamqp sources.

-- 
Ricardo

[bug#34515] [PATCH 05/13] gnu: python-twisted: Update to 17.5.0

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-xyz.scm (python-twisted, python2-twisted): Update
> to 17.5.0.

LGTM.

-- 
Ricardo

[bug#34515] [PATCH 06/13] gnu: Add python-treq.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-web.scm (python-treq): New variable.
[…]
> +    (description "This package provides an HTTP library inspired by
> +@code{requests}} but written on top of @code{Twisted's} Agents.

Should @code{…} be moved from “Twisted’s” to “Agents”?

Otherwise looks good to me.

-- 
Ricardo

[bug#34515] [PATCH 07/13] gnu: Add python-hkdf.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-crypto.scm (python-hkdf): New variable.

LGTM!

-- 
Ricardo

[bug#34515] [PATCH 08/13] gnu: Add python-spake2.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-crypto.scm (python-spake2): New variable.

LGTM!

-- 
Ricardo

[bug#34515] [PATCH 09/13] gnu: Add python-txtorcon.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-crypto.scm (python-txtorcon): New variable.
[…]
> +    (arguments
> +     `(#:tests? #f)) ; fail silently

Could you please elaborate on this?  Do all tests fail?  Would it make
sense to disable the broken tests?  Are test failures known to upstream?

Other than that it looks good to me.

-- 
Ricardo

[bug#34515] [PATCH 10/13] gnu: Add python-autobahn.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/python-web.scm (python-autobahn): New variable.
[…]
> +    (arguments
> +     `(#:tests? #f)) ; fail mysteriously

Mysteriously, eh?  Do you have any more information about this that
might help us debug this?

-- 
Ricardo

[bug#34515] [PATCH 11/13] gnu: Add magic-wormhole-mailbox-server.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/magic-wormhole.scm: New file.
> * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

Okay.

> +    (arguments
> +      ;; Tests seem to be Python 2 only...
> +      ;; "TypeError: a bytes-like object is required, not 'str'"
> +     '(#:tests? #f))

This seems to be a problem with Python 3.7.  Scons suffers from the same
problem.

Could it be that the tests use the “imp” module?  If so they might be
fixed by using importlib instead.

> +    (synopsis "Magic-Wormhole central server")

Maybe “Magic-Wormhole central mailbox server”?

LGTM!

--
Ricardo

[bug#34515] [PATCH 12/13] gnu: Add magic-wormhole-transit-relay.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): New variable.

LGTM!

-- 
Ricardo

[bug#34515] [PATCH 13/13] gnu: Add Magic-Wormhole.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> * gnu/packages/magic-wormhole.scm (magic-wormhole): New variable.
[…]
> +         ;; XXX I can't figure out how to build the docs properly.
> +         (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)))))

What does it mean to build them properly?  Should anything besides the
man pages be built?

> +    (native-inputs
> +     `(("python-mock" ,python-mock)
> +       ;; XXX These are required for the test suite but end up being referenced
> +       ;; by the built package.
> +       ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
> +       ("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay)))

Are they not supposed to be referenced by the built package?
If they are supposed to be used by the built package is it enough to
have them as inputs and not as propagated inputs?

> +    (description "Magic-Wormhole is a library and a command-line tool named
> +wormhole, which makes it possible to securely transfer arbitrary-sized files and
> +directories (or short pieces of text) from one computer to another.  The two
> +endpoints are identified by using identical \"wormhole codes\": in general, the
> +sending machine generates and displays the code, which must then be typed into
> +the receiving machine.
> +
> +The codes are short and human-pronounceable, using a phonetically-distinct
> +wordlist.  The receiving side offers tab-completion on the codewords, so usually
> +only a few characters must be typed.  Wormhole codes are single-use and do not
> +need to be memorized.")

Neat!

LGTM.  Thank you for this patch set!

-- 
Ricardo

[bug#34515] [PATCH 04/13] gnu: python-txamqp: Depend on python-hyperlink.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 430 bytes --]

On Mon, Feb 18, 2019 at 09:05:47AM +0100, Ricardo Wurmus wrote:
> Leo Famulari <leo@famulari.name> writes:
> > python2-txamqp)[propagated-inputs]: Add python-hyperlink.
> 
> How can we tell that txamqp really requires hyperlink?  I haven’t been
> able to find a reference to hyperlink in the txamqp sources.

Indeed, it looks like Twisted itself requires hyperlink now. I'll adjust
the rest of the patches accordingly.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 06/13] gnu: Add python-treq.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

On Mon, Feb 18, 2019 at 09:08:31AM +0100, Ricardo Wurmus wrote:
> 
> Leo Famulari <leo@famulari.name> writes:
> 
> > * gnu/packages/python-web.scm (python-treq): New variable.
> […]
> > +    (description "This package provides an HTTP library inspired by
> > +@code{requests}} but written on top of @code{Twisted's} Agents.
> 
> Should @code{…} be moved from “Twisted’s” to “Agents”?
> 
> Otherwise looks good to me.

Thanks, will do.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 09/13] gnu: Add python-txtorcon.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 950 bytes --]

On Mon, Feb 18, 2019 at 09:25:55AM +0100, Ricardo Wurmus wrote:
> Leo Famulari <leo@famulari.name> writes:
> > * gnu/packages/python-crypto.scm (python-txtorcon): New variable.
> […]
> > +    (arguments
> > +     `(#:tests? #f)) ; fail silently
> 
> Could you please elaborate on this?  Do all tests fail?  Would it make
> sense to disable the broken tests?  Are test failures known to upstream?

Basically, the first test that runs looks for a file
'release-announce-test' in the root of the tarball.

This file does not exist in the PyPi or GitHub releases (they are
identical). I checked several releases going back to December 2015, and
none of them contain this file, so I'm not sure what's going on.

Reported upstream at <https://github.com/meejah/txtorcon/issues/330>.

I'll add a comment explaining this.

Also, while skimming some other tests I began to suspect they require
internet access, although I'm not sure.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 10/13] gnu: Add python-autobahn.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 2450 bytes --]

On Mon, Feb 18, 2019 at 09:27:50AM +0100, Ricardo Wurmus wrote:
> Leo Famulari <leo@famulari.name> writes:
> > * gnu/packages/python-web.scm (python-autobahn): New variable.
> […]
> > +    (arguments
> > +     `(#:tests? #f)) ; fail mysteriously
> 
> Mysteriously, eh?  Do you have any more information about this that
> might help us debug this?

Basically, the tests quit early after several errors like this:

------
______ ERROR collecting build/lib/autobahn/nvx/test/test_utf8validator.py ______
import file mismatch:
imported module 'test_utf8validator' has this __file__ attribute:
  /tmp/guix-build-python-autobahn-19.2.1.drv-0/autobahn-19.2.1/autobahn/nvx/test/test_utf8validator.py
which is not the same as the test file we want to collect:
  /tmp/guix-build-python-autobahn-19.2.1.drv-0/autobahn-19.2.1/build/lib/autobahn/nvx/test/test_utf8validator.py
HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules
------

I don't fully understand the issue but it's discussed in the pytest bug
tracker as a general issue:

https://github.com/pytest-dev/pytest/issues/529

What do you think? My opinion is that the test suite is broken.

The failure can be reproduced by adding this patch:

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index c58f358c63..e4ca630498 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3014,7 +3014,23 @@ high level API for making HTTP requests when using Twisted.")
           "1mm7j24ls01c7jb1ad5p5cpyxvzgydiyf8b04ihykh2v8g98j0x7"))))
     (build-system python-build-system)
     (arguments
-     `(#:tests? #f)) ; fail mysteriously
+     `(#:tests? #t
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'adjust-tests
+           (lambda _
+             ;; This variable chooses whether to use Twisted or
+             ;; asyncio for the tests.
+             (setenv "USE_TWISTED" "true")
+             ;; The require an old pytest because they aim to support
+             ;; Python 3.3.
+             (substitute* "setup.py"
+               (("pytest>=2.8.6,<3.3.0")
+                 "pytest"))
+             #t)))))
+    (native-inputs
+     `(("python-mock" ,python-mock)
+       ("python-pytest" ,python-pytest)))
     (propagated-inputs
      `(("python-cffi" ,python-cffi)
        ("python-twisted" ,python-twisted)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 11/13] gnu: Add magic-wormhole-mailbox-server.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 887 bytes --]

On Mon, Feb 18, 2019 at 09:44:27AM +0100, Ricardo Wurmus wrote:
> Leo Famulari <leo@famulari.name> writes:
> > +    (arguments
> > +      ;; Tests seem to be Python 2 only...
> > +      ;; "TypeError: a bytes-like object is required, not 'str'"
> > +     '(#:tests? #f))
> 
> This seems to be a problem with Python 3.7.  Scons suffers from the same
> problem.
> 
> Could it be that the tests use the “imp” module?  If so they might be
> fixed by using importlib instead.

Thanks for this tip. I dug in and couldn't find such an import, but I
realized that the test failure was caused by missing network access. The
"bytes-like object" message must come from some error handler. I worked
around it by skipping the test in question.

> > +    (synopsis "Magic-Wormhole central server")
> 
> Maybe “Magic-Wormhole central mailbox server”?

Good idea, thanks!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 13/13] gnu: Add Magic-Wormhole.

[Leo Famulari]

[-- Attachment #1.1: Type: text/plain, Size: 3342 bytes --]

On Mon, Feb 18, 2019 at 09:51:11AM +0100, Ricardo Wurmus wrote:
> Leo Famulari <leo@famulari.name> writes:
> > * gnu/packages/magic-wormhole.scm (magic-wormhole): New variable.
> […]
> > +         ;; XXX I can't figure out how to build the docs properly.
> > +         (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)))))
> 
> What does it mean to build them properly?  Should anything besides the
> man pages be built?

In short, it fails like this:

------
make: Entering directory '/tmp/guix-build-magic-wormhole-0.11.2.drv-0/magic-wormhole-0.11.2/docs'
Running Sphinx v1.7.7
setup.py:20: DeprecationWarning: 'U' mode is deprecated
  long_description=open('README.md', 'rU').read(),
/gnu/store/b7fqhszxl02g6pfm3vw6b3cjz472qrly-python-3.7.0/lib/python3.7/distutils/dist.py:274: UserWarning: Unknown distribution option: 'long_description_content_type'
  warnings.warn(msg)

Configuration error:
There is a programable error in your configuration file:

Traceback (most recent call last):
  File "/gnu/store/q6qyrgr41lqzbray6944l1rs7i6b83kp-python-sphinx-1.7.7/lib/python3.7/site-packages/sphinx/config.py", line 161, in __init__
    execfile_(filename, config)
  File "/gnu/store/q6qyrgr41lqzbray6944l1rs7i6b83kp-python-sphinx-1.7.7/lib/python3.7/site-packages/sphinx/util/pycompat.py", line 150, in execfile_
    exec_(code, _globals)
  File "conf.py", line 70, in <module>
    version, release = _get_versions()
  File "conf.py", line 67, in _get_versions
    short = ".".join(v.split(".")[:2])
TypeError: a bytes-like object is required, not 'str'

make: *** [Makefile:20: man] Error 2
make: Leaving directory '/tmp/guix-build-magic-wormhole-0.11.2.drv-0/magic-wormhole-0.11.2/docs'
------

Using the patch under discussion, only a pre-built manual page is
installed.

There is apparently a build script that uses Sphinx to build a more full
set of manual pages, from markdown source files. This documentation
would discuss the design and implementation of Magic-Wormhole, and it
would be nice to have.

With the attached patch, the problem can be reproduced, and I've
reported it upstream here:

https://github.com/warner/magic-wormhole/issues/321

> > +    (native-inputs
> > +     `(("python-mock" ,python-mock)
> > +       ;; XXX These are required for the test suite but end up being referenced
> > +       ;; by the built package.
> > +       ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
> > +       ("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay)))
> 
> Are they not supposed to be referenced by the built package?
> If they are supposed to be used by the built package is it enough to
> have them as inputs and not as propagated inputs?

In this case they are actually native-inputs, not propagated-inputs. But
they still end up on the PYTHONPATHs in the built package, so they are
referenced.

I don't believe they are used by the magic-wormhole program except in
client-server way over the network. They shouldn't need to be part of
the closure of magic-wormhole.

[-- Attachment #1.2: doc-build.patch --]
[-- Type: text/plain, Size: 3709 bytes --]

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index 4f8fabd1c5..80e707a3e2 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -117,17 +117,20 @@ together, allowing them to pretend they have a direct connection.")
           "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"))))
     (build-system python-build-system)
     (arguments
-     '(#:phases
+     '(#:tests? #f ; to speed up debugging the documentation build failure
+       #:phases
        (modify-phases %standard-phases
          ;; XXX I can't figure out how to build the docs properly.
          (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)))))
+               (invoke "make" "-C" "docs" "man")
+             #t))))))
     (native-inputs
      `(("python-mock" ,python-mock)
+       ("python-sphinx" ,python-sphinx)
+       ("python-recommonmark" ,python-recommonmark)
        ;; XXX These are required for the test suite but end up being referenced
        ;; by the built package.
        ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
@@ -156,3 +159,68 @@ wordlist.  The receiving side offers tab-completion on the codewords, so usually
 only a few characters must be typed.  Wormhole codes are single-use and do not
 need to be memorized.")
     (license expat)))
+
+(define-public python-commonmark
+  (package
+    (name "python-commonmark")
+    (version "0.8.1")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "commonmark" version))
+        (sha256
+          (base32
+            "1130029ykz4jny5sr65zb03lm2xp062k4pmfaapxxrgaw1acijxb"))))
+    (build-system python-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; have to delete and recreate check?
+         (delete 'check)
+         (add-after 'install 'check
+                    ;; inputs and outputs?
+           (lambda* (#:key inputs outputs #:allow-other-keys)
+             (add-installed-pythonpath inputs outputs)
+             (invoke "python" "setup.py" "test"))))
+       )
+      )
+    (propagated-inputs
+     `(
+        ("python-flake8" ,python-flake8)
+        ("python-future" ,python-future)
+        ("python-hypothesis" ,python-hypothesis)
+        ))
+    (home-page
+      "https://github.com/rtfd/CommonMark-py")
+    (synopsis
+      "Python parser for the CommonMark Markdown spec")
+    (description
+      "Python parser for the CommonMark Markdown spec")
+    (license bsd-3)))
+
+(define-public python-recommonmark
+  (package
+    (name "python-recommonmark")
+    (version "0.5.0")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "recommonmark" version))
+        (sha256
+          (base32
+            "0j5vylbhdddjhc6kj4y9pm8pyf7yy9965kr77bi1m9bia39bh855"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:tests? #f)) ; fail mysteriously...
+    (propagated-inputs
+      `(("python-commonmark" ,python-commonmark)
+        ("python-docutils" ,python-docutils)
+        ("python-sphinx" ,python-sphinx)))
+    (home-page
+      "https://github.com/rtfd/recommonmark")
+    (synopsis
+      "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects.")
+    (description
+      "A docutils-compatibility bridge to CommonMark, enabling you to write CommonMark inside of Docutils & Sphinx projects.")
+    (license expat)))
+

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#34515] [PATCH 10/13] gnu: Add python-autobahn.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Feb 18, 2019 at 09:27:50AM +0100, Ricardo Wurmus wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> > * gnu/packages/python-web.scm (python-autobahn): New variable.
>> […]
>> > +    (arguments
>> > +     `(#:tests? #f)) ; fail mysteriously
>>
>> Mysteriously, eh?  Do you have any more information about this that
>> might help us debug this?
>
> Basically, the tests quit early after several errors like this:
>
> ------
> ______ ERROR collecting build/lib/autobahn/nvx/test/test_utf8validator.py ______
> import file mismatch:
> imported module 'test_utf8validator' has this __file__ attribute:
>   /tmp/guix-build-python-autobahn-19.2.1.drv-0/autobahn-19.2.1/autobahn/nvx/test/test_utf8validator.py
> which is not the same as the test file we want to collect:
>   /tmp/guix-build-python-autobahn-19.2.1.drv-0/autobahn-19.2.1/build/lib/autobahn/nvx/test/test_utf8validator.py
> HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules
> ------
>
> I don't fully understand the issue but it's discussed in the pytest bug
> tracker as a general issue:
>
> https://github.com/pytest-dev/pytest/issues/529
>
> What do you think? My opinion is that the test suite is broken.

Yeah, I think it’s fine to disable tests in this case.  Would be good to
report this upstream, though.  This might be a Python 2 vs Python 3
difference (due to implicit namespaces in the latter).

--
Ricardo

[bug#34515] [PATCH 13/13] gnu: Add Magic-Wormhole.

[Ricardo Wurmus]

Leo Famulari <leo@famulari.name> writes:

> On Mon, Feb 18, 2019 at 09:51:11AM +0100, Ricardo Wurmus wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> > * gnu/packages/magic-wormhole.scm (magic-wormhole): New variable.
>> […]
>> > +         ;; XXX I can't figure out how to build the docs properly.
>> > +         (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)))))
>> 
>> What does it mean to build them properly?  Should anything besides the
>> man pages be built?
>
> In short, it fails like this:
>
> ------
> make: Entering directory '/tmp/guix-build-magic-wormhole-0.11.2.drv-0/magic-wormhole-0.11.2/docs'
> Running Sphinx v1.7.7
> setup.py:20: DeprecationWarning: 'U' mode is deprecated
>   long_description=open('README.md', 'rU').read(),
> /gnu/store/b7fqhszxl02g6pfm3vw6b3cjz472qrly-python-3.7.0/lib/python3.7/distutils/dist.py:274: UserWarning: Unknown distribution option: 'long_description_content_type'
>   warnings.warn(msg)
>
> Configuration error:
> There is a programable error in your configuration file:
>
> Traceback (most recent call last):
>   File "/gnu/store/q6qyrgr41lqzbray6944l1rs7i6b83kp-python-sphinx-1.7.7/lib/python3.7/site-packages/sphinx/config.py", line 161, in __init__
>     execfile_(filename, config)
>   File "/gnu/store/q6qyrgr41lqzbray6944l1rs7i6b83kp-python-sphinx-1.7.7/lib/python3.7/site-packages/sphinx/util/pycompat.py", line 150, in execfile_
>     exec_(code, _globals)
>   File "conf.py", line 70, in <module>
>     version, release = _get_versions()
>   File "conf.py", line 67, in _get_versions
>     short = ".".join(v.split(".")[:2])
> TypeError: a bytes-like object is required, not 'str'
>
> make: *** [Makefile:20: man] Error 2
> make: Leaving directory '/tmp/guix-build-magic-wormhole-0.11.2.drv-0/magic-wormhole-0.11.2/docs'
> ------
>
> Using the patch under discussion, only a pre-built manual page is
> installed.

Ah, I see.

My guess is that this is due to the use of Python 3.7.0.  I wonder if
this class of problems disappears with 3.7.1.

It’s fine to install the pre-built man pages for now.

>> > +    (native-inputs
>> > +     `(("python-mock" ,python-mock)
>> > +       ;; XXX These are required for the test suite but end up being referenced
>> > +       ;; by the built package.
>> > +       ("magic-wormhole-mailbox-server" ,magic-wormhole-mailbox-server)
>> > +       ("magic-wormhole-transit-relay" ,magic-wormhole-transit-relay)))
>> 
>> Are they not supposed to be referenced by the built package?
>> If they are supposed to be used by the built package is it enough to
>> have them as inputs and not as propagated inputs?
>
> In this case they are actually native-inputs, not propagated-inputs. But
> they still end up on the PYTHONPATHs in the built package, so they are
> referenced.
>
> I don't believe they are used by the magic-wormhole program except in
> client-server way over the network. They shouldn't need to be part of
> the closure of magic-wormhole.

I think that’s this bug:

    https://issues.guix.info/issue/25235

Feel free to push your patches.  Thanks!

-- 
Ricardo

[bug#34515] [PATCH 10/13] gnu: Add python-autobahn.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 388 bytes --]

On Tue, Feb 19, 2019 at 08:36:26AM +0100, Ricardo Wurmus wrote:
> Yeah, I think it’s fine to disable tests in this case.  Would be good to
> report this upstream, though.  This might be a Python 2 vs Python 3
> difference (due to implicit namespaces in the latter).

I had the same hunch and tried building it with Python 2, but saw the
same failures.

I will report upstream.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#34515: [PATCH 13/13] gnu: Add Magic-Wormhole.

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 250 bytes --]

On Tue, Feb 19, 2019 at 08:52:08AM +0100, Ricardo Wurmus wrote:
> Feel free to push your patches.  Thanks!

I added some more comments and links to bug reports and pushed as
a7db61a55dc4e369574e206a86f9e5721f4a890b.

Thanks for your review, Ricardo!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]