[PATCH 13/18] gnu: Add python-amqp.

[PATCH 13/18] gnu: Add python-amqp.

[Christopher Allan Webber]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0013-gnu-Add-python-amqp.patch --]
[-- Type: text/x-patch, Size: 2224 bytes --]

From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 14 Feb 2016 12:44:03 -0800
Subject: [PATCH 13/18] gnu: Add python-amqp.

* gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
---
 gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 82a467b..f9ad796 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
                  #:python ,python-2))
     (inputs `(("python2-setuptools" ,python2-setuptools)
               ("python2-nose" ,python2-nose)))))
+
+(define-public python-amqp
+  (package
+    (name "python-amqp")
+    (version "1.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "amqp" version))
+       (sha256
+        (base32
+         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-mock" ,python-mock)))
+    (home-page "http://github.com/celery/py-amqp")
+    (synopsis
+     "Low-level AMQP client for Python (fork of amqplib)")
+    (description
+     "This is a fork of amqplib which was originally written by Barry Pederson.
+It is maintained by the Celery project, and used by kombu as a pure python
+alternative when librabbitmq is not available.")
+    (license lgpl2.1+)
+    (properties `((python2-variant . ,(delay python2-amqp))))))
+
+(define-public python2-amqp
+  (let ((amqp (package-with-python2
+               (strip-python2-variant python-amqp))))
+    (package
+      (inherit amqp)
+      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
+                   ;; unmaintained.  Weirdly, does not do this on the python 3
+                   ;; version?
+                   #:tests? #f
+                   ,@(package-arguments amqp)))
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs amqp))))))
-- 
2.6.3

Re: [PATCH 13/18] gnu: Add python-amqp.

[Leo Famulari]

On Mon, Feb 15, 2016 at 03:32:16PM -0800, Christopher Allan Webber wrote:
> From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
> From: Christopher Allan Webber <cwebber@dustycloud.org>
> Date: Sun, 14 Feb 2016 12:44:03 -0800
> Subject: [PATCH 13/18] gnu: Add python-amqp.
> 
> * gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
> ---
>  gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
>  1 file changed, 38 insertions(+)
> 
> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> index 82a467b..f9ad796 100644
> --- a/gnu/packages/python.scm
> +++ b/gnu/packages/python.scm
> @@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
>                   #:python ,python-2))
>      (inputs `(("python2-setuptools" ,python2-setuptools)
>                ("python2-nose" ,python2-nose)))))
> +
> +(define-public python-amqp
> +  (package
> +    (name "python-amqp")
> +    (version "1.4.9")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (uri (pypi-uri "amqp" version))
> +       (sha256
> +        (base32
> +         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
> +    (build-system python-build-system)
> +    (native-inputs
> +     `(("python-nose" ,python-nose)
> +       ("python-mock" ,python-mock)))
> +    (home-page "http://github.com/celery/py-amqp")
> +    (synopsis
> +     "Low-level AMQP client for Python (fork of amqplib)")
> +    (description
> +     "This is a fork of amqplib which was originally written by Barry Pederson.
> +It is maintained by the Celery project, and used by kombu as a pure python
> +alternative when librabbitmq is not available.")
> +    (license lgpl2.1+)
> +    (properties `((python2-variant . ,(delay python2-amqp))))))
> +
> +(define-public python2-amqp
> +  (let ((amqp (package-with-python2
> +               (strip-python2-variant python-amqp))))
> +    (package
> +      (inherit amqp)
> +      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
> +                   ;; unmaintained.  Weirdly, does not do this on the python 3
> +                   ;; version?
> +                   #:tests? #f

Do we need the python-2 version? Maybe it's not worth the effort if the
AMQP authors are depending on an unmaintained. Maybe they don't even
intend to support python-2 anymore.

> +                   ,@(package-arguments amqp)))
> +      (native-inputs `(("python2-setuptools" ,python2-setuptools)
> +                       ,@(package-native-inputs amqp))))))
> -- 
> 2.6.3
> 
> 

Re: [PATCH 13/18] gnu: Add python-amqp.

[Christopher Allan Webber]

Leo Famulari writes:

> On Mon, Feb 15, 2016 at 03:32:16PM -0800, Christopher Allan Webber wrote:
>> From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
>> From: Christopher Allan Webber <cwebber@dustycloud.org>
>> Date: Sun, 14 Feb 2016 12:44:03 -0800
>> Subject: [PATCH 13/18] gnu: Add python-amqp.
>> 
>> * gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
>> ---
>>  gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 38 insertions(+)
>> 
>> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
>> index 82a467b..f9ad796 100644
>> --- a/gnu/packages/python.scm
>> +++ b/gnu/packages/python.scm
>> @@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
>>                   #:python ,python-2))
>>      (inputs `(("python2-setuptools" ,python2-setuptools)
>>                ("python2-nose" ,python2-nose)))))
>> +
>> +(define-public python-amqp
>> +  (package
>> +    (name "python-amqp")
>> +    (version "1.4.9")
>> +    (source
>> +     (origin
>> +       (method url-fetch)
>> +       (uri (pypi-uri "amqp" version))
>> +       (sha256
>> +        (base32
>> +         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
>> +    (build-system python-build-system)
>> +    (native-inputs
>> +     `(("python-nose" ,python-nose)
>> +       ("python-mock" ,python-mock)))
>> +    (home-page "http://github.com/celery/py-amqp")
>> +    (synopsis
>> +     "Low-level AMQP client for Python (fork of amqplib)")
>> +    (description
>> +     "This is a fork of amqplib which was originally written by Barry Pederson.
>> +It is maintained by the Celery project, and used by kombu as a pure python
>> +alternative when librabbitmq is not available.")
>> +    (license lgpl2.1+)
>> +    (properties `((python2-variant . ,(delay python2-amqp))))))
>> +
>> +(define-public python2-amqp
>> +  (let ((amqp (package-with-python2
>> +               (strip-python2-variant python-amqp))))
>> +    (package
>> +      (inherit amqp)
>> +      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
>> +                   ;; unmaintained.  Weirdly, does not do this on the python 3
>> +                   ;; version?
>> +                   #:tests? #f
>
> Do we need the python-2 version? Maybe it's not worth the effort if the
> AMQP authors are depending on an unmaintained. Maybe they don't even
> intend to support python-2 anymore.

Maybe we don't need to.  It would mean cutting out a few packages from
here.

The main benefit of this would be that it would be easy for me to use
"guix environment" to test MediaGoblin on both Python 2 and 3... but I
could still package these things locally if that isn't worth the public
Guix benefit.

Re: [PATCH 13/18] gnu: Add python-amqp.

[Leo Famulari]

On Fri, Feb 19, 2016 at 04:41:59PM -0800, Christopher Allan Webber wrote:
> Leo Famulari writes:
> 
> > On Mon, Feb 15, 2016 at 03:32:16PM -0800, Christopher Allan Webber wrote:
> >> From dedac86054cf1526731411b8b505084dd375de17 Mon Sep 17 00:00:00 2001
> >> From: Christopher Allan Webber <cwebber@dustycloud.org>
> >> Date: Sun, 14 Feb 2016 12:44:03 -0800
> >> Subject: [PATCH 13/18] gnu: Add python-amqp.
> >> 
> >> * gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
> >> ---
> >>  gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
> >>  1 file changed, 38 insertions(+)
> >> 
> >> diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
> >> index 82a467b..f9ad796 100644
> >> --- a/gnu/packages/python.scm
> >> +++ b/gnu/packages/python.scm
> >> @@ -7895,3 +7895,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
> >>                   #:python ,python-2))
> >>      (inputs `(("python2-setuptools" ,python2-setuptools)
> >>                ("python2-nose" ,python2-nose)))))
> >> +
> >> +(define-public python-amqp
> >> +  (package
> >> +    (name "python-amqp")
> >> +    (version "1.4.9")
> >> +    (source
> >> +     (origin
> >> +       (method url-fetch)
> >> +       (uri (pypi-uri "amqp" version))
> >> +       (sha256
> >> +        (base32
> >> +         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
> >> +    (build-system python-build-system)
> >> +    (native-inputs
> >> +     `(("python-nose" ,python-nose)
> >> +       ("python-mock" ,python-mock)))
> >> +    (home-page "http://github.com/celery/py-amqp")
> >> +    (synopsis
> >> +     "Low-level AMQP client for Python (fork of amqplib)")
> >> +    (description
> >> +     "This is a fork of amqplib which was originally written by Barry Pederson.
> >> +It is maintained by the Celery project, and used by kombu as a pure python
> >> +alternative when librabbitmq is not available.")
> >> +    (license lgpl2.1+)
> >> +    (properties `((python2-variant . ,(delay python2-amqp))))))
> >> +
> >> +(define-public python2-amqp
> >> +  (let ((amqp (package-with-python2
> >> +               (strip-python2-variant python-amqp))))
> >> +    (package
> >> +      (inherit amqp)
> >> +      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
> >> +                   ;; unmaintained.  Weirdly, does not do this on the python 3
> >> +                   ;; version?
> >> +                   #:tests? #f
> >
> > Do we need the python-2 version? Maybe it's not worth the effort if the
> > AMQP authors are depending on an unmaintained. Maybe they don't even
> > intend to support python-2 anymore.
> 
> Maybe we don't need to.  It would mean cutting out a few packages from
> here.
> 
> The main benefit of this would be that it would be easy for me to use
> "guix environment" to test MediaGoblin on both Python 2 and 3... but I
> could still package these things locally if that isn't worth the public
> Guix benefit.

If it's required for MediaGoblin on Python 2, and you intend to support
both versions of Python, then I don't see an issue including it.

Re: [PATCH 13/18] gnu: Add python-amqp.

[Christopher Allan Webber]

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

Updated.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0012-gnu-Add-python-amqp.patch --]
[-- Type: text/x-diff, Size: 2239 bytes --]

From e46ca4e62ce4d6143c48c7367093f7eb8b47a622 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 14 Feb 2016 12:44:03 -0800
Subject: [PATCH 12/18] gnu: Add python-amqp.

* gnu/packages/python.scm (python-amqp, python2-amqp): New variables.
---
 gnu/packages/python.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 7ce4f09..05d775e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7896,3 +7896,41 @@ and provides a uniform API regardless of which JSON implementation is used.")
                  #:python ,python-2))
     (native-inputs `(("python2-setuptools" ,python2-setuptools)
                      ("python2-nose" ,python2-nose)))))
+
+(define-public python-amqp
+  (package
+    (name "python-amqp")
+    (version "1.4.9")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "amqp" version))
+       (sha256
+        (base32
+         "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid"))))
+    (build-system python-build-system)
+    (native-inputs
+     `(("python-nose" ,python-nose)
+       ("python-mock" ,python-mock)))
+    (home-page "http://github.com/celery/py-amqp")
+    (synopsis
+     "Low-level AMQP client for Python (fork of amqplib)")
+    (description
+     "This is a fork of amqplib which was originally written by Barry Pederson.
+It is maintained by the Celery project, and used by kombu as a pure python
+alternative when librabbitmq is not available.")
+    (license lgpl2.1+)
+    (properties `((python2-variant . ,(delay python2-amqp))))))
+
+(define-public python2-amqp
+  (let ((amqp (package-with-python2
+               (strip-python2-variant python-amqp))))
+    (package
+      (inherit amqp)
+      (arguments `(;; Tries to run coverage tests with nose-cover3, which seems
+                   ;; unmaintained.  Weirdly, does not do this on the python 3
+                   ;; version?
+                   #:tests? #f
+                   ,@(package-arguments amqp)))
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ,@(package-native-inputs amqp))))))
-- 
2.6.3