The recent [0] update of py-zmq to 17.1.2 breaks jupyter-notebook.

ERROR:tornado.general:Uncaught exception in ZMQStream callback
Traceback (most recent call last):
  File "/usr/local/lib/python3.6/site-packages/zmq/eventloop/zmqstream.py", 
line 432, in _run_callback
    callback(*args, **kwargs)
  File "/usr/local/lib/python3.6/site-packages/tornado/stack_context.py", line 
275, in null_wrapper
    return fn(*args, **kwargs)
  File "/usr/local/lib/python3.6/site-packages/ipykernel/kernelbase.py", line 
283, in dispatcher
    return self.dispatch_shell(stream, msg)
  File "/usr/local/lib/python3.6/site-packages/ipykernel/kernelbase.py", line 
233, in dispatch_shell
    self.pre_handler_hook()
  File "/usr/local/lib/python3.6/site-packages/ipykernel/kernelbase.py", line 
248, in pre_handler_hook
    self.saved_sigint_handler = signal(SIGINT, default_int_handler)
  File "/usr/local/lib/python3.6/signal.py", line 47, in signal
    handler = _signal.signal(_enum_to_int(signalnum), _enum_to_int(handler))
ValueError: signal only works in main thread

I am unable to find a solution for this problem. I did find a
workaround: updating to a newer version of py-ipykernel. Elias M.
Mariani was so kind to provide a diff for updating our version in ports,
which has been OKed by edd@ [1]. However, this update breaks
py-matplotlib. The latter issue is fixed by updating py-matplotlib,
which relies on new DEPs...

Way forward would be to:
1.) Import py-kiwisolver (sent to ports@)
2.) Import py-subprocess32 (sent to ports@)
3.) Update py-matplotlib (diff sent to MAINTAINER)
4.) Update py-ipykernel (OKed [1])

However, I'm not confident that there is enough time to test the above
before the 6.4 freeze. Therefore I would like to propose to revert the
recent update of py-zmq. Diff enclosed.

Comments/OKs?

[0] 
https://github.com/openbsd/ports/commit/e3f0042bb0fac47efd85480852a9d5636387bfd2
[1] https://marc.info/?l=openbsd-ports&m=153559672813813&w=2


diff --git Makefile Makefile
index 93d1d6c61fd..07d0bca16b3 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,10 @@
 
 COMMENT =              Python bindings for ZeroMQ
 
-MODPY_EGG_VERSION =    17.1.2
+MODPY_EGG_VERSION =    16.0.3
 DISTNAME =             pyzmq-${MODPY_EGG_VERSION}
 PKGNAME =              ${DISTNAME:S/py/py-/}
+EPOCH =                        0
 
 CATEGORIES =           net devel
 
@@ -22,6 +23,10 @@ MODULES =            lang/python
 LIB_DEPENDS =          ${MODPY_LIB_DEPENDS} \
                        net/zeromq
 
+# ssh tunnelling
+RUN_DEPENDS =          security/py-paramiko${MODPY_FLAVOR} \
+                       devel/py-pexpect${MODPY_FLAVOR}
+
 MODPY_PI =             Yes
 MODPY_DISTUTILS_BUILDARGS =    --zmq=${LOCALBASE}
 
diff --git distinfo distinfo
index aa7b18b1a5c..27ec6733e7e 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (pyzmq-17.1.2.tar.gz) = pyuCrBkQ8s9hpJE59JdPmUmER193Gw+qcwg5YH7u3d8=
-SIZE (pyzmq-17.1.2.tar.gz) = 1080194
+SHA256 (pyzmq-16.0.3.tar.gz) = iog4JBR1I8D+dtJH3ViZTBwo7wfxzF3eWVpP0cKPJYA=
+SIZE (pyzmq-16.0.3.tar.gz) = 1063036
diff --git pkg/PLIST pkg/PLIST
index 74825467260..2e222a104c0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -4,10 +4,8 @@ lib/python${MODPY_VERSION}/site-packages/zmq/
 lib/python${MODPY_VERSION}/site-packages/zmq/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}_future.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/_future.py
 lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/${MODPY_PYCACHE}/
@@ -98,11 +96,9 @@ lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/
 lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}_deprecated.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}future.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}zmqstream.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/_deprecated.py
 lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/future.py
 lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/ioloop.py
 lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/minitornado/
@@ -198,7 +194,6 @@ 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_constant
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_decorators.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_device.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_draft.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_error.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_etc.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_future.${MODPY_PYC_MAGIC_TAG}pyc
@@ -236,7 +231,6 @@ 
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_constants.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_context.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_decorators.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_device.py
-lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_draft.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_error.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_etc.py
 lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_future.py
@@ -283,7 +277,6 @@ 
lib/python${MODPY_VERSION}/site-packages/zmq/utils/interop.py
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/ipcmaxlen.h
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/jsonapi.py
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/monitor.py
-lib/python${MODPY_VERSION}/site-packages/zmq/utils/mutex.h
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/pyversion_compat.h
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/sixcerpt.py
 lib/python${MODPY_VERSION}/site-packages/zmq/utils/strtypes.py

Reply via email to