4 files changed, 31 insertions, 76 deletions

diff --git a/net/py-pyzmq/Makefile b/net/py-pyzmq/Makefile
index 6e6e2a1051c2..a22e84e358cb 100644
--- a/net/py-pyzmq/Makefile
+++ b/net/py-pyzmq/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyzmq
-PORTVERSION=	17.1.2
+PORTVERSION=	18.0.0
 CATEGORIES=	net devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net/py-pyzmq/distinfo b/net/py-pyzmq/distinfo
index 2896ccd7fa43..4c9177f2f175 100644
--- a/net/py-pyzmq/distinfo
+++ b/net/py-pyzmq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1539504765
-SHA256 (pyzmq-17.1.2.tar.gz) = a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf
-SIZE (pyzmq-17.1.2.tar.gz) = 1080194
+TIMESTAMP = 1551109436
+SHA256 (pyzmq-18.0.0.tar.gz) = b30c339eb58355f51f4f54dd61d785f1ff58c86bca1c3a5916977631d121867b
+SIZE (pyzmq-18.0.0.tar.gz) = 1155815
diff --git a/net/py-pyzmq/files/patch-PR1219 b/net/py-pyzmq/files/patch-PR1219
deleted file mode 100644
index 9fc07e8280d1..000000000000
--- a/net/py-pyzmq/files/patch-PR1219
+++ /dev/null
@@ -1,72 +0,0 @@
-From 545ed995e2121b8229390a34a3ae144f3a13cd84 Mon Sep 17 00:00:00 2001
-From: Min RK <benjaminrk@gmail.com>
-Date: Mon, 20 Aug 2018 17:02:04 +0200
-Subject: [PATCH] improve test_large_send
-
-- reduce memory requirements by calling `recv(copy=False)`
-- treat MemoryError during send/recv as a skip due to insufficient memory
-- give it mark.large so it's easier for test runners to skip it explicitly
----
- zmq/tests/test_socket.py | 32 +++++++++++++++++++++++---------
- 1 file changed, 23 insertions(+), 9 deletions(-)
-
-diff --git zmq/tests/test_socket.py zmq/tests/test_socket.py
-index 72eedb5a..59bf087e 100644
---- zmq/tests/test_socket.py
-+++ zmq/tests/test_socket.py
-@@ -485,7 +485,7 @@ def test_subscribe_method(self):
-         pub.send(b'prefixmessage')
-         events = p.poll(1000)
-         self.assertEqual(events, [])
--    
-+
-     # Travis can't handle how much memory PyPy uses on this test
-     @mark.skipif(
-         (
-@@ -497,16 +497,30 @@ def test_subscribe_method(self):
-         ),
-         reason="only run on 64b and not on Travis."
-     )
-+    @mark.large
-     def test_large_send(self):
-+        c = os.urandom(1)
-+        N = 2**31 + 1
-         try:
--            buf = os.urandom(1) * (2**31 + 1)
--        except MemoryError:
--            raise SkipTest()
-+            buf = c * N
-+        except MemoryError as e:
-+            raise SkipTest("Not enough memory: %s" % e)
-         a, b = self.create_bound_pair()
--        a.send(buf, copy=False)
--        rcvd = b.recv()
--        assert rcvd == buf
--    
-+        try:
-+            a.send(buf, copy=False)
-+            rcvd = b.recv(copy=False)
-+        except MemoryError as e:
-+            raise SkipTest("Not enough memory: %s" % e)
-+        # sample the front and back of the received message
-+        # without checking the whole content
-+        # Python 2: items in memoryview are bytes
-+        # Python 3: items im memoryview are int
-+        byte = c if sys.version_info < (3,) else ord(c)
-+        view = memoryview(rcvd)
-+        assert len(view) == N
-+        assert view[0] == byte
-+        assert view[-1] == byte
-+
-     def test_custom_serialize(self):
-         a, b = self.create_bound_pair(zmq.DEALER, zmq.ROUTER)
-         def serialize(msg):
-@@ -515,7 +529,7 @@ def serialize(msg):
-             content = json.dumps(msg['content']).encode('utf8')
-             frames.append(content)
-             return frames
--        
-+
-         def deserialize(frames):
-             identities = frames[:-1]
-             content = json.loads(frames[-1].decode('utf8'))
diff --git a/net/py-pyzmq/files/patch-setup.py b/net/py-pyzmq/files/patch-setup.py
new file mode 100644
index 000000000000..24ab6129b451
--- /dev/null
+++ b/net/py-pyzmq/files/patch-setup.py
@@ -0,0 +1,27 @@
+--- setup.py.orig	2019-02-19 12:38:50 UTC
++++ setup.py
+@@ -1,4 +1,6 @@
+ #!/usr/bin/env python
++# -*- coding: utf-8 -*-
++#
+ #-----------------------------------------------------------------------------
+ #  Copyright (C) PyZMQ Developers
+ #  Distributed under the terms of the Modified BSD License.
+@@ -24,6 +26,7 @@ import sys
+ import time
+ import errno
+ import platform
++import codecs
+ from traceback import print_exc
+ 
+ # whether any kind of bdist is happening
+@@ -1236,8 +1239,7 @@ def find_packages():
+ #-----------------------------------------------------------------------------
+ # Main setup
+ #-----------------------------------------------------------------------------
+-
+-with open("README.md") as f:
++with codecs.open('README.md', 'r', 'utf-8') as f:
+     long_desc = f.read()
+ 
+ setup_args = dict(