Enclosed diff brings py-jupyer_client to 5.3.4, which is needed for a
pending update of jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_client/blob/5.3.4/docs/changelog.rst.
Changes to the port:
- Follow Makefile.template
- Update dependencies
Testing:
- 'make test' fails TestKernelManager.test_signal_kernel_subprocesses
for both python2 and python3. I do not understand why this test fails.
On python3 all other tests are OK. Python2 fails one other tests
because of 'too many open files'
- Run tested on amd64 with jupyter-notebook from ports and an update
hereof
Comments/OK?
diff --git Makefile Makefile
index 824719ebdc3..39baa98de92 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
COMMENT = Jupyter protocol implementation and client libraries
-MODPY_EGG_VERSION = 5.2.4
+MODPY_EGG_VERSION = 5.3.4
DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
CATEGORIES = devel
@@ -20,24 +19,25 @@ MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = jupyter_client
-PORTHOME = ${WRKDIR}
-FLAVORS = python3
-FLAVOR ?=
-
-RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR} \
- devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
+RUN_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}>=2.1 \
+ devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.0 \
devel/py-traitlets${MODPY_FLAVOR} \
- net/py-zmq${MODPY_FLAVOR} \
- www/py-tornado${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
- devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
+ net/py-zmq${MODPY_FLAVOR}>=13 \
+ www/py-tornado${MODPY_FLAVOR}>=4.1
+TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
+ devel/py-ipykernel${MODPY_FLAVOR} \
shells/bash
+FLAVORS = python3
+FLAVOR ?=
+
.if !${FLAVOR:Mpython3}
TEST_DEPENDS += devel/py-mock
.endif
+PORTHOME = ${WRKDIR}
+
post-install:
mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 8763b398bf6..6d67b9dab73 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_client-5.2.4.tar.gz) =
tfnLBhBcHS0wcZ21/7PqZ9pgkZ+2jervpYPezNiBNVE=
-SIZE (jupyter_client-5.2.4.tar.gz) = 273397
+SHA256 (jupyter_client-5.3.4.tar.gz) =
YOb67BAx1j31fxzGce1nPc7Q7UIPQ3fqM9s3scGIuRA=
+SIZE (jupyter_client-5.3.4.tar.gz) = 275850
diff --git patches/patch-jupyter_client_connect_py
patches/patch-jupyter_client_connect_py
index 3f522511b9f..84d90a98954 100644
--- patches/patch-jupyter_client_connect_py
+++ patches/patch-jupyter_client_connect_py
@@ -9,10 +9,10 @@ Index: jupyter_client/connect.py
import warnings
+import sys
from getpass import getpass
+ from contextlib import contextmanager
- import zmq
-@@ -137,7 +138,7 @@ def write_connection_file(fname=None, shell_port=0, io
- with open(fname, 'w') as f:
+@@ -141,7 +142,7 @@ def write_connection_file(fname=None, shell_port=0, io
+ with secure_write(fname) as f:
f.write(json.dumps(cfg, indent=2))
- if hasattr(stat, 'S_ISVTX'):
