04/05: gnu: python-pyopenssl: Update to 17.2.0.

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 2580c2f07f2882552ecfee5206dccf9ada15c7e1
Author: Marius Bakke <address@hidden>
Date:   Sat Jul 22 14:19:43 2017 +0200

    gnu: python-pyopenssl: Update to 17.2.0.
    
    * gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch: Delete 
file.
    * gnu/local.mk (dist_patch_DATA): Remove it.
    * gnu/packages/python.scm (python-pyopenssl, python2-pyopenssl): Update to 
17.2.0.
    [native-inputs]: Add PYTHON-FLAKY.
    [source](patches): Remove.
---
 gnu/local.mk                                       |  1 -
 .../python-pyopenssl-17.1.0-test-overflow.patch    | 36 ----------------------
 gnu/packages/python.scm                            |  9 +++---
 3 files changed, 4 insertions(+), 42 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6d9e570..bc2d79c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -972,7 +972,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch     \
   %D%/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \
   %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \
-  %D%/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch     \
   %D%/packages/patches/python2-subprocess32-disable-input-test.patch   \
   %D%/packages/patches/qemu-CVE-2017-7493.patch                        \
   %D%/packages/patches/qemu-CVE-2017-8112.patch                        \
diff --git a/gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch 
b/gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch
deleted file mode 100644
index 06b2f4f..0000000
--- a/gnu/packages/patches/python-pyopenssl-17.1.0-test-overflow.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Resolves a test failure on 32-bit platforms.
-
-https://github.com/pyca/pyopenssl/issues/657
-
-Patch copied from upstream source repository:
-
-https://github.com/pyca/pyopenssl/commit/ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95
-
-From ecc0325479c0d5c5f2ca88b4550e87cdb59d6c95 Mon Sep 17 00:00:00 2001
-From: Alex Gaynor <address@hidden>
-Date: Thu, 6 Jul 2017 22:14:44 -0400
-Subject: [PATCH] Fixed #657 -- handle OverflowErrors on large allocation
- requests
-
----
- tests/test_rand.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/test_rand.py b/tests/test_rand.py
-index bdd3af08..6adf72a1 100644
---- a/tests/test_rand.py
-+++ b/tests/test_rand.py
-@@ -32,10 +32,10 @@ def test_bytes_wrong_args(self, args):
- 
-     def test_insufficient_memory(self):
-         """
--        `OpenSSL.rand.bytes` raises `MemoryError` if more bytes are requested
--        than will fit in memory.
-+        `OpenSSL.rand.bytes` raises `MemoryError` or `OverflowError` if more
-+        bytes are requested than will fit in memory.
-         """
--        with pytest.raises(MemoryError):
-+        with pytest.raises((MemoryError, OverflowError)):
-             rand.bytes(sys.maxsize)
- 
-     def test_bytes(self):
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 619dc07..ce2864e 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -7709,16 +7709,14 @@ message digests and key derivation functions.")
 (define-public python-pyopenssl
   (package
     (name "python-pyopenssl")
-    (version "17.1.0")
+    (version "17.2.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "pyOpenSSL" version))
-       (patches
-        (search-patches "python-pyopenssl-17.1.0-test-overflow.patch"))
        (sha256
         (base32
-         "0qwmqhfsq84ydir9dz273ypmlcvs7v71m1jns0sd4k0h6lfsa82s"))))
+         "0d283g4zi0hr9papd24mjl70mi15gyzq6fx618rizi87dgipqqax"))))
     (build-system python-build-system)
     (arguments
      '(#:phases
@@ -7742,7 +7740,8 @@ message digests and key derivation functions.")
     (inputs
      `(("openssl" ,openssl)))
     (native-inputs
-     `(("python-pretend" ,python-pretend)
+     `(("python-flaky" ,python-flaky)
+       ("python-pretend" ,python-pretend)
        ("python-pytest" ,python-pytest-3.0)))
     (home-page "https://github.com/pyca/pyopenssl";)
     (synopsis "Python wrapper module around the OpenSSL library")