Index: head/net/py-pyzmq/Makefile =================================================================== --- head/net/py-pyzmq/Makefile (revision 494158) +++ head/net/py-pyzmq/Makefile (revision 494159) @@ -1,40 +1,40 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= pyzmq -PORTVERSION= 17.1.2 +PORTVERSION= 18.0.0 CATEGORIES= net devel MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= novel@FreeBSD.org COMMENT= Python bindings for ZeroMQ LICENSE= BSD3CLAUSE LGPL3 LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/COPYING.BSD LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libzmq.so:net/libzmq4 TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist PYDISTUTILS_CONFIGUREARGS= --zmq=${LOCALBASE} .include .if ${PYTHON_VER} == 3.3 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}asyncio>0:devel/py-asyncio@${PY_FLAVOR} .endif do-test: @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} build_ext --inplace @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zmq/backend/cython/*.so ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/zmq/devices/*.so .include Index: head/net/py-pyzmq/distinfo =================================================================== --- head/net/py-pyzmq/distinfo (revision 494158) +++ head/net/py-pyzmq/distinfo (revision 494159) @@ -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 Index: head/net/py-pyzmq/files/patch-PR1219 =================================================================== --- head/net/py-pyzmq/files/patch-PR1219 (revision 494158) +++ head/net/py-pyzmq/files/patch-PR1219 (nonexistent) @@ -1,72 +0,0 @@ -From 545ed995e2121b8229390a34a3ae144f3a13cd84 Mon Sep 17 00:00:00 2001 -From: Min RK -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')) Property changes on: head/net/py-pyzmq/files/patch-PR1219 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/py-pyzmq/files/patch-setup.py =================================================================== --- head/net/py-pyzmq/files/patch-setup.py (nonexistent) +++ head/net/py-pyzmq/files/patch-setup.py (revision 494159) @@ -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( Property changes on: head/net/py-pyzmq/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property