[PATCH 0/2] Fix python{,2}-pyopenssl

[PATCH 0/2] Fix python{,2}-pyopenssl

[Cyril Roelandt]

This patch series updates python{2,}-pyopenssl so that it compiles again. Added
benefit: we do not have to skip tests any more!

Cyril.
---

Cyril Roelandt (2):
  gnu: python-cryptography, python-cryptography-vectors: Update to
    1.3.1.
  gnu: python-pyopenssl, python2-pyopenssl: Update to 16.0.0.

 gnu/packages/python.scm | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

-- 
2.6.2

[PATCH 1/2] gnu: python-cryptography, python-cryptography-vectors: Update to 1.3.1.

[Cyril Roelandt]

These packages should be updated together.

* gnu/packages/python.scm (python-cryptography): Update to 1.3.1.
(python-cryptography-vectors): Update to 1.3.1.
---
 gnu/packages/python.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index e320226..511648e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5791,7 +5791,7 @@ responses, rather than doing any computation.")
 (define-public python-cryptography-vectors
   (package
     (name "python-cryptography-vectors")
-    (version "1.2.3")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
@@ -5800,7 +5800,7 @@ responses, rather than doing any computation.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "0shawgpax79gvjrj0a313sll9gaqys7q1hxngn6j4k24lmz7bwki"))))
+         "1144l3ypz3bngxd59lb4y74xa401w92lhvvjgxzglmvbh8wzkcbb"))))
     (build-system python-build-system)
     (native-inputs
      `(("python-setuptools" ,python-setuptools)))
@@ -5817,14 +5817,14 @@ responses, rather than doing any computation.")
 (define-public python-cryptography
   (package
     (name "python-cryptography")
-    (version "1.2.3")
+    (version "1.3.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "cryptography" version))
        (sha256
         (base32
-         "0kj511z4g21fhcr649pyzpl0zzkkc7hsgxxjys6z8wwfvmvirccf"))))
+         "1qjkrpfvxcyd0kal3zpm5y7f9p3y77ixn9jw8f4dqpgrw1sn3cxl"))))
     (build-system python-build-system)
     (inputs
      `(("openssl" ,openssl)))
-- 
2.6.2

[PATCH 2/2] gnu: python-pyopenssl, python2-pyopenssl: Update to 16.0.0.

[Cyril Roelandt]

* gnu/packages/python.scm (python-pyopenssl, python2-pyopenssl):
Update to 16.0.0.
---
 gnu/packages/python.scm | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)

diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 511648e..b434e60 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -5868,7 +5868,7 @@ message digests and key derivation functions.")
 (define-public python-pyopenssl
   (package
     (name "python-pyopenssl")
-    (version "0.15.1")
+    (version "16.0.0")
     (source
      (origin
        (method url-fetch)
@@ -5876,29 +5876,8 @@ message digests and key derivation functions.")
                            "pyOpenSSL/pyOpenSSL-" version ".tar.gz"))
        (sha256
         (base32
-         "0wnnq15rhj7fhdcd8ycwiw6r6g3w9f9lcy6cigg8226vsrq618ph"))))
+         "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n"))))
     (build-system python-build-system)
-    (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-tests
-          (lambda* (#:key inputs #:allow-other-keys)
-            (substitute* "OpenSSL/test/test_ssl.py"
-              (("client\\.connect\\(\\('verisign\\.com', 443\\)\\)")
-               "return True")
-              ;; FIXME: disable broken test
-              (("test_set_tmp_ecdh") "disabled__set_tmp_ecdh"))
-            (substitute* "OpenSSL/test/test_crypto.py"
-              (("command = b\"openssl \"")
-               (string-append "command = b\""
-                              (assoc-ref inputs "openssl")
-                              "/bin/openssl" " \""))
-              ;; FIXME: disable four broken tests
-              (("test_der")             "disabled__der")
-              (("test_digest")          "disabled__digest")
-              (("test_get_extension")   "disabled__get_extension")
-              (("test_extension_count") "disabled__extension_count"))
-            #t)))))
     (propagated-inputs
      `(("python-cryptography" ,python-cryptography)
        ("python-six" ,python-six)))
-- 
2.6.2

Re: [PATCH 0/2] Fix python{,2}-pyopenssl

[Leo Famulari]

Can you check how this is different from the 'fix-letsencrypt' branch on hydra?

Sorry for the top post... Phone


-------- Original Message --------
From: Cyril Roelandt <tipecaml@gmail.com>
Sent: March 31, 2016 4:43:35 PM EDT
To: guix-devel@gnu.org
Subject: [PATCH 0/2] Fix python{,2}-pyopenssl

This patch series updates python{2,}-pyopenssl so that it compiles again. Added
benefit: we do not have to skip tests any more!

Cyril.
---

Cyril Roelandt (2):
  gnu: python-cryptography, python-cryptography-vectors: Update to
    1.3.1.
  gnu: python-pyopenssl, python2-pyopenssl: Update to 16.0.0.

 gnu/packages/python.scm | 33 ++++++---------------------------
 1 file changed, 6 insertions(+), 27 deletions(-)

Re: [PATCH 0/2] Fix python{,2}-pyopenssl

[Cyril Roelandt]

On 03/31/2016 11:17 PM, Leo Famulari wrote:
> Can you check how this is different from the 'fix-letsencrypt' branch on hydra?
> 

I guess that is the same. Why don't we push this on master?

Cyril.

Re: [PATCH 0/2] Fix python{,2}-pyopenssl

[Leo Famulari]

On Fri, Apr 01, 2016 at 12:09:38AM +0200, Cyril Roelandt wrote:
> On 03/31/2016 11:17 PM, Leo Famulari wrote:
> > Can you check how this is different from the 'fix-letsencrypt' branch on hydra?
> > 
> 
> I guess that is the same. Why don't we push this on master?

The update to python-pytest on my branch is relatively expensive (~200
rebuilds).

I just rebased on master, and I'm testing locally. If that works we'll
start building it on hydra:

lists.gnu.org/archive/html/guix-devel/2016-03/msg01404.html