Commit f9725a41 authored by Julian Taylor's avatar Julian Taylor

Import pyzmq_16.0.2.orig.tar.gz

parent 26263ee1
......@@ -32,7 +32,7 @@ pjoin = os.path.join
# Constants
#-----------------------------------------------------------------------------
bundled_version = (4,1,5)
bundled_version = (4,1,6)
vs = '%i.%i.%i' % bundled_version
libzmq = "zeromq-%s.tar.gz" % vs
libzmq_url = "https://github.com/zeromq/zeromq{major}-{minor}/releases/download/v{vs}/{libzmq}".format(
......@@ -41,7 +41,7 @@ libzmq_url = "https://github.com/zeromq/zeromq{major}-{minor}/releases/download/
vs=vs,
libzmq=libzmq,
)
libzmq_checksum = "sha256:04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf"
libzmq_checksum = "sha256:02ebf60a43011e770799336365bcbce2eb85569e9b5f52aa0d8cc04672438a0a"
HERE = os.path.dirname(__file__)
ROOT = os.path.dirname(HERE)
......
......@@ -10,6 +10,17 @@ This is a coarse summary of changes in pyzmq versions.
For a full changelog, consult the `git log <https://github.com/zeromq/pyzmq/commits>`_.
16.0.2
======
- Workaround bug in libzmq-4.2.0 causing EINVAL on poll.
16.0.1
======
- Fix erroneous EAGAIN that could happen on async sockets
- Bundle libzmq 4.1.6
16.0
====
......
......@@ -1216,6 +1216,7 @@ def find_packages():
long_desc = \
"""
PyZMQ is the official Python binding for the ZeroMQ Messaging Library (http://www.zeromq.org).
See `the docs <https://pyzmq.readthedocs.io>`_ for more info.
"""
setup_args = dict(
......
......@@ -36,9 +36,10 @@ py_exes = {
'3.4' : _framework_py('3.4'),
'3.5' : _framework_py('3.5'),
'pypy': "/usr/local/bin/pypy",
'pypy3': "/usr/local/bin/pypy3",
# FIXME: pypy3 can have releases when they support Python >= 3.3
# 'pypy3': "/usr/local/bin/pypy3",
}
egg_pys = {'2.7'}
egg_pys = {} # no more eggs!
tmp = "/tmp"
env_root = os.path.join(tmp, 'envs')
......@@ -145,7 +146,7 @@ def build_sdist(py, upload=False):
Returns the path to the tarball
"""
with cd(repo_root):
cmd = [py, 'setup.py', 'sdist', '--formats=zip,gztar']
cmd = [py, 'setup.py', 'sdist']
run(cmd)
if upload:
run(['twine', 'upload', 'dist/*'])
......
......@@ -82,6 +82,7 @@ def zmq_poll(sockets, long timeout=-1):
s, events = sockets[i]
if isinstance(s, Socket):
pollitems[i].socket = (<Socket>s).handle
pollitems[i].fd = 0
pollitems[i].events = events
pollitems[i].revents = 0
elif isinstance(s, int_t):
......
......@@ -355,6 +355,9 @@ class _AsyncSocket(_zmq.Socket):
def _handle_recv(self):
"""Handle recv events"""
if not self._shadow_sock.events & POLLIN:
# event triggered, but state may have been changed between trigger and callback
return
f = None
while self._recv_futures:
f, kind, kwargs, _ = self._recv_futures.pop(0)
......@@ -390,6 +393,9 @@ class _AsyncSocket(_zmq.Socket):
f.set_result(result)
def _handle_send(self):
if not self._shadow_sock.events & POLLOUT:
# event triggered, but state may have been changed between trigger and callback
return
f = None
while self._send_futures:
f, kind, kwargs, msg = self._send_futures.pop(0)
......
......@@ -180,7 +180,7 @@ class ZMQIOLoop(PollIOLoop):
# quietly return on ETERM
pass
else:
raise e
raise
if (3, 0) <= tornado_version < (3, 1):
......
......@@ -9,7 +9,7 @@ from zmq.backend import zmq_version_info
VERSION_MAJOR = 16
VERSION_MINOR = 0
VERSION_PATCH = 0
VERSION_PATCH = 2
VERSION_EXTRA = ""
__version__ = '%i.%i.%i' % (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment