Re: [PATCH 01/04] gnu: Add python-pygpgme

2016-02-06 Thread Christopher Allan Webber 
Ludovic Courtès writes:

> OK to push with these and Leo’s other comments addressed!
>
> Thank you,
> Ludo’.

Changes made, and pushed, thanks!

Re: [PATCH 01/04] gnu: Add python-pygpgme

2016-02-06 Thread Leo Famulari 
On Fri, Feb 05, 2016 at 07:47:26PM -0800, Christopher Allan Webber wrote:
> First of several patches on the path to assword!

Thanks! Funniest package name in Guix, I'd say!

> * gnu/packages/gnupg.scm (python-pygpgme, python2-pygpgme): New variables.
> * gnu/packages/patches/pygpgme-disable-problematic-tests.patch: New file.

Please add the patch to gnu-system.am (dist_patch_DATA).

> ---
>  gnu/packages/gnupg.scm | 42 
> ++
>  .../pygpgme-disable-problematic-tests.patch| 37 +++
>  2 files changed, 79 insertions(+)
>  create mode 100644 
> gnu/packages/patches/pygpgme-disable-problematic-tests.patch
> 
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 501cf55..bdc5e4a 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -5,6 +5,7 @@
>  ;;; Copyright © 2014, 2015 Mark H Weaver 
>  ;;; Copyright © 2015 Paul van der Walt 
>  ;;; Copyright © 2015, 2016 Efraim Flashner 
> +;;; Copyright © 2016 Christopher Allan Webber 
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -23,6 +24,7 @@
>  
>  (define-module (gnu packages gnupg)
>#:use-module ((guix licenses) #:prefix license:)
> +  #:use-module (gnu packages)
>#:use-module (gnu packages adns)
>#:use-module (gnu packages curl)
>#:use-module (gnu packages openldap)
> @@ -332,6 +334,46 @@ instead.  This way bug fixes or improvements can be done 
> at a central place
>  and every application benefits from this.")
>  (license license:lgpl2.1+)))
>  
> +(define-public python-pygpgme
> +  (package
> +(name "python-pygpgme")
> +(version "0.3")
> +(source
> + (origin
> +   (method url-fetch)
> +   (uri (pypi-uri "pygpgme" version))
> +   (sha256
> +(base32
> + "1q82p3gs6lwq8j8dxk4pvrwk3jpww1zqcjrzznl9clh10z28gn2z"))
> +   ;; Unfortunately, we have to disable some tests due to some gpg-agent
> +   ;; goofiness... see:
> +   ;;   https://bugs.launchpad.net/pygpgme/+bug/49
> +   (patches (list (search-patch 
> "pygpgme-disable-problematic-tests.patch")
> +(arguments
> + `(#:phases
> +   (modify-phases %standard-phases
> + (add-before 'build 'make-build
> + (lambda (. args)
> +   (zero? (system* "make" "build"

I'm not a Scheme expert, but I wonder about "lambda (.args)". Most of
these calls to (system*) start with "lambda _". What is the difference
here?

> + (replace 'check
> +   (lambda _
> + (zero? (system* "make" "check")))
> +(build-system python-build-system)
> +(inputs
> + `(("python-setuptools" ,python-setuptools)

If setuptools are only required for the python-2 variant, please add a
comment to that effect, so that we can easily remove it once we fix bug
#22437.
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=22437

> +   ("gnupg" ,gnupg-2.0)

Does it only work with gnupg-2.0? We also package the 2.1 series of
GnuPG.

> +   ("gpgme" ,gpgme)))
> +(home-page "https://launchpad.net/pygpgme;)
> +(synopsis
> + "A Python module for working with OpenPGP messages")

This can all go on one line.

> +(description
> + "PyGPGME is a Python module that lets you sign, verify, encrypt and
> +decrypt messages using the OpenPGP format.")

Can you mention that it uses GPGME in the description?

> +(license license:lgpl2.1+)))
> +
> +(define-public python2-pygpgme
> +  (package-with-python2 python-pygpgme))
> +
>  (define-public python-gnupg
>(package
>  (name "python-gnupg")
> diff --git a/gnu/packages/patches/pygpgme-disable-problematic-tests.patch 
> b/gnu/packages/patches/pygpgme-disable-problematic-tests.patch
> new file mode 100644
> index 000..2129d2f
> --- /dev/null
> +++ b/gnu/packages/patches/pygpgme-disable-problematic-tests.patch
> @@ -0,0 +1,37 @@
> +These tests require a gpg agent to run, and are difficult to get to work 
> right
> +in Guix's environment.  For more details, see:
> +  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713074
> +  https://bugs.launchpad.net/pygpgme/+bug/49
> +
> +--- pygpgme-0.3/tests/test_encrypt_decrypt.py2012-02-28 
> 19:10:28.0 -0800
>  pygpgme-0.3/tests/test_encrypt_decrypt.py2016-02-05 
> 10:21:58.966685384 -0800
> +@@ -125,7 +125,7 @@
> + ctx.decrypt(ciphertext, plaintext)
> + self.assertEqual(plaintext.getvalue(), b'Hello World\n')
> + 
> +-def test_encrypt_symmetric(self):
> ++def skip_test_encrypt_symmetric(self):
> + plaintext = BytesIO(b'Hello World\n')
> + ciphertext = BytesIO()
> + def passphrase(uid_hint, passphrase_info, prev_was_bad, fd):
> +
> +--- pygpgme-0.3/tests/test_passphrase.py 2012-02-28 19:04:17.0 
> -0800
>  pygpgme-0.3/tests/test_passphrase.py 2016-02-05 10:21:47.990630956 
> -0800
> +@@ -30,7

Re: [PATCH 01/04] gnu: Add python-pygpgme

2016-02-06 Thread Ludovic Courtès 
Leo Famulari  skribis:

> On Fri, Feb 05, 2016 at 07:47:26PM -0800, Christopher Allan Webber wrote:

[...]

>> +   ;; Unfortunately, we have to disable some tests due to some gpg-agent
>> +   ;; goofiness... see:
>> +   ;;   https://bugs.launchpad.net/pygpgme/+bug/49
>> +   (patches (list (search-patch 
>> "pygpgme-disable-problematic-tests.patch")
>> +(arguments
>> + `(#:phases
>> +   (modify-phases %standard-phases
>> + (add-before 'build 'make-build
>> + (lambda (. args)
>> +   (zero? (system* "make" "build"
>
> I'm not a Scheme expert, but I wonder about "lambda (.args)". Most of
> these calls to (system*) start with "lambda _". What is the difference
> here?

(lambda (. args) …) is equivalent to (lambda args …), meaning a
procedure that takes an unlimited number of arguments.

It’s a convention to use ‘_’ to denote unused variables, so we usually
write (lambda _ …) in such cases.

The lambda above is slightly two indented; perhaps the guix-devel Emacs
mode isn’t loaded?

>> +   ("gnupg" ,gnupg-2.0)
>
> Does it only work with gnupg-2.0? We also package the 2.1 series of
> GnuPG.

I think we should stick to 2.0, which is the latest stable version.

>> +   ("gpgme" ,gpgme)))
>> +(home-page "https://launchpad.net/pygpgme;)
>> +(synopsis
>> + "A Python module for working with OpenPGP messages")
>
> This can all go on one line.

Also please remove “A” (I think ‘guix lint’ would complain.)

OK to push with these and Leo’s other comments addressed!

Thank you,
Ludo’.

[PATCH 01/04] gnu: Add python-pygpgme

2016-02-05 Thread Christopher Allan Webber 
First of several patches on the path to assword!

>From 2137270785d39d2592e4ffc2b3c3253fd0daf540 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber 
Date: Fri, 5 Feb 2016 11:06:54 -0800
Subject: [PATCH 1/4] gnu: Add python-pygpgme

* gnu/packages/gnupg.scm (python-pygpgme, python2-pygpgme): New variables.
* gnu/packages/patches/pygpgme-disable-problematic-tests.patch: New file.
---
 gnu/packages/gnupg.scm | 42 ++
 .../pygpgme-disable-problematic-tests.patch| 37 +++
 2 files changed, 79 insertions(+)
 create mode 100644 gnu/packages/patches/pygpgme-disable-problematic-tests.patch

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 501cf55..bdc5e4a 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2014, 2015 Mark H Weaver 
 ;;; Copyright © 2015 Paul van der Walt 
 ;;; Copyright © 2015, 2016 Efraim Flashner 
+;;; Copyright © 2016 Christopher Allan Webber 
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
 
 (define-module (gnu packages gnupg)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu packages)
   #:use-module (gnu packages adns)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages openldap)
@@ -332,6 +334,46 @@ instead.  This way bug fixes or improvements can be done at a central place
 and every application benefits from this.")
 (license license:lgpl2.1+)))
 
+(define-public python-pygpgme
+  (package
+(name "python-pygpgme")
+(version "0.3")
+(source
+ (origin
+   (method url-fetch)
+   (uri (pypi-uri "pygpgme" version))
+   (sha256
+(base32
+ "1q82p3gs6lwq8j8dxk4pvrwk3jpww1zqcjrzznl9clh10z28gn2z"))
+   ;; Unfortunately, we have to disable some tests due to some gpg-agent
+   ;; goofiness... see:
+   ;;   https://bugs.launchpad.net/pygpgme/+bug/49
+   (patches (list (search-patch "pygpgme-disable-problematic-tests.patch")
+(arguments
+ `(#:phases
+   (modify-phases %standard-phases
+ (add-before 'build 'make-build
+ (lambda (. args)
+   (zero? (system* "make" "build"
+ (replace 'check
+   (lambda _
+ (zero? (system* "make" "check")))
+(build-system python-build-system)
+(inputs
+ `(("python-setuptools" ,python-setuptools)
+   ("gnupg" ,gnupg-2.0)
+   ("gpgme" ,gpgme)))
+(home-page "https://launchpad.net/pygpgme;)
+(synopsis
+ "A Python module for working with OpenPGP messages")
+(description
+ "PyGPGME is a Python module that lets you sign, verify, encrypt and
+decrypt messages using the OpenPGP format.")
+(license license:lgpl2.1+)))
+
+(define-public python2-pygpgme
+  (package-with-python2 python-pygpgme))
+
 (define-public python-gnupg
   (package
 (name "python-gnupg")
diff --git a/gnu/packages/patches/pygpgme-disable-problematic-tests.patch b/gnu/packages/patches/pygpgme-disable-problematic-tests.patch
new file mode 100644
index 000..2129d2f
--- /dev/null
+++ b/gnu/packages/patches/pygpgme-disable-problematic-tests.patch
@@ -0,0 +1,37 @@
+These tests require a gpg agent to run, and are difficult to get to work right
+in Guix's environment.  For more details, see:
+  https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713074
+  https://bugs.launchpad.net/pygpgme/+bug/49
+
+--- pygpgme-0.3/tests/test_encrypt_decrypt.py	2012-02-28 19:10:28.0 -0800
 pygpgme-0.3/tests/test_encrypt_decrypt.py	2016-02-05 10:21:58.966685384 -0800
+@@ -125,7 +125,7 @@
+ ctx.decrypt(ciphertext, plaintext)
+ self.assertEqual(plaintext.getvalue(), b'Hello World\n')
+ 
+-def test_encrypt_symmetric(self):
++def skip_test_encrypt_symmetric(self):
+ plaintext = BytesIO(b'Hello World\n')
+ ciphertext = BytesIO()
+ def passphrase(uid_hint, passphrase_info, prev_was_bad, fd):
+
+--- pygpgme-0.3/tests/test_passphrase.py	2012-02-28 19:04:17.0 -0800
 pygpgme-0.3/tests/test_passphrase.py	2016-02-05 10:21:47.990630956 -0800
+@@ -30,7 +30,7 @@
+ 
+ import_keys = ['passphrase.pub', 'passphrase.sec']
+ 
+-def test_sign_without_passphrase_cb(self):
++def skip_test_sign_without_passphrase_cb(self):
+ ctx = gpgme.Context()
+ key = ctx.get_key('EFB052B4230BBBC51914BCBB54DCBBC8DBFB9EB3')
+ ctx.signers = [key]
+@@ -51,7 +51,7 @@
+ self.prev_was_bad = prev_was_bad
+ os.write(fd, b'test\n')
+ 
+-def test_sign_with_passphrase_cb(self):
++def skip_test_sign_with_passphrase_cb(self):
+ ctx = gpgme.Context()
+ key = ctx.get_key('EFB052B4230BBBC51914BCBB54DCBBC8DBFB9EB3')
+ ctx.signers = [key]
-- 
2.6.3