From: Daniel Dickman <didickman@gmail.com>
Subject: update jupyter_server 1.x -> 2.x
To: ports@openbsd.org
Cc: bket@openbsd.org
Date: Tue, 16 Jul 2024 23:25:11 -0400

Here are the final new ports needed to update jupyter_server and then see 
inline below for the update of jupyter_server itself from the 1.x series 
to the 2.x.

Once this goes in we can import jupyterlab, and then finally update 
jupyter notebook.

Would appreciate an ok to import the attached 2 ports.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_server/Makefile,v
diff -u -p -u -r1.3 Makefile
--- Makefile	6 May 2024 12:23:20 -0000	1.3
+++ Makefile	17 Jul 2024 03:19:43 -0000
@@ -1,10 +1,8 @@
-COMMENT =		core APIs and REST endpoints for Jupyter web applications
+COMMENT =		backend for Jupyter web applications
 
-# XXX can't update to 2.x until notebook supports it
-MODPY_EGG_VERSION =	1.24.0
+MODPY_EGG_VERSION =	2.14.1
 DISTNAME =		jupyter_server-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
 
 CATEGORIES =		devel
 
@@ -21,41 +19,40 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_PYBUILD =		jupyter_packaging
+MODPY_PYBUILD =		hatchling
 
-BUILD_DEPENDS =		devel/pre-commit${MODPY_FLAVOR}
+BUILD_DEPENDS =		devel/py-hatch-jupyter-builder${MODPY_FLAVOR}
 
-RUN_DEPENDS =		devel/py-jupyter_client${MODPY_FLAVOR}>=6.1.12 \
-			devel/py-jupyter_core${MODPY_FLAVOR}>=4.12.0 \
+RUN_DEPENDS =		devel/py-jupyter_client${MODPY_FLAVOR}>=7.4.4 \
+			devel/py-jupyter_core${MODPY_FLAVOR}>=5.1 \
+			devel/py-jupyter_events${MODPY_FLAVOR}>=0.9.0 \
+			devel/py-jupyter_server_terminals${MODPY_FLAVOR}>=0.4.4 \
 			devel/py-nbconvert${MODPY_FLAVOR}>=6.4.4 \
-			devel/py-nbformat${MODPY_FLAVOR}>=5.2.0 \
-			devel/py-send2trash${MODPY_FLAVOR} \
-			devel/py-traitlets${MODPY_FLAVOR}>=5.1 \
-			net/py-anyio${MODPY_FLAVOR}>=3.1.0,<4 \
-			net/py-websocket-client${MODPY_FLAVOR} \
-			net/py-zmq${MODPY_FLAVOR}>=17v0 \
-			security/py-argon2-cffi${MODPY_FLAVOR} \
-			sysutils/py-packaging${MODPY_FLAVOR} \
-			sysutils/py-prometheus_client${MODPY_FLAVOR} \
-			www/py-jinja2${MODPY_FLAVOR} \
+			devel/py-nbformat${MODPY_FLAVOR}>=5.3.0 \
+			devel/py-overrides${MODPY_FLAVOR}>=5.0 \
+			devel/py-send2trash${MODPY_FLAVOR}>=1.8.2 \
+			devel/py-traitlets${MODPY_FLAVOR}>=5.6.0 \
+			net/py-anyio${MODPY_FLAVOR}>=3.1.0 \
+			net/py-websocket-client${MODPY_FLAVOR}>=1.7 \
+			net/py-zmq${MODPY_FLAVOR}>=24v0 \
+			security/py-argon2-cffi${MODPY_FLAVOR}>=21.1 \
+			sysutils/py-packaging${MODPY_FLAVOR}>=22.0 \
+			sysutils/py-prometheus_client${MODPY_FLAVOR}>=0.9 \
+			www/py-jinja2${MODPY_FLAVOR}>=3.0.3 \
 			www/py-terminado${MODPY_FLAVOR}>=0.8.3 \
-			www/py-tornado${MODPY_FLAVOR}>=6.1.0
+			www/py-tornado${MODPY_FLAVOR}>=6.2.0
 
-# needs pytest-console-scripts
 TEST_DEPENDS =		devel/pre-commit${MODPY_FLAVOR} \
 			devel/py-coverage${MODPY_FLAVOR} \
+			devel/py-flaky${MODPY_FLAVOR} \
 			devel/py-ipykernel${MODPY_FLAVOR} \
+			devel/py-test-console-scripts${MODPY_FLAVOR} \
 			devel/py-test-cov${MODPY_FLAVOR} \
 			devel/py-test-jupyter${MODPY_FLAVOR} \
 			devel/py-test-mock${MODPY_FLAVOR} \
 			devel/py-test-timeout${MODPY_FLAVOR} \
-			devel/py-test-tornasync${MODPY_FLAVOR} \
 			www/py-requests${MODPY_FLAVOR}
 
-# avoid trying to fetch from the network during build if npm is installed
-# XXX setting JUPYTER_PACKAGING_SKIP_NPM=1 in MAKE_ENV should do this too,
-# but doesn't seem to work
-post-extract:
-	ln -s /usr/bin/true ${WRKDIR}/bin/npm
+PORTHOME =		${WRKDIR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_server/distinfo,v
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo	28 Feb 2024 23:58:35 -0000	1.1.1.1
+++ distinfo	17 Jul 2024 03:19:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (jupyter_server-1.24.0.tar.gz) = IzaOjiFLr4KzE9TFoNgoynMBXhoZLOOCm9dOYvq40EY=
-SIZE (jupyter_server-1.24.0.tar.gz) = 456590
+SHA256 (jupyter_server-2.14.1.tar.gz) = ElWNFY7HoGU7+WzCcrx6154BJ9UDuYLtFEOZNGaU9yY=
+SIZE (jupyter_server-2.14.1.tar.gz) = 719107
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-jupyter_server/pkg/PLIST,v
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST	28 Feb 2024 23:58:35 -0000	1.1.1.1
+++ pkg/PLIST	17 Jul 2024 03:19:43 -0000
@@ -1,12 +1,12 @@
 bin/jupyter-server
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/COPYING.md
 lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/METADATA
 lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/RECORD
 lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/__init__.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/${MODPY_PYCACHE}/
@@ -49,6 +49,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}authorizer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}decorator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}decorator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}logout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -59,6 +61,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/authorizer.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/decorator.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/identity.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/login.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/logout.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/auth/security.py
@@ -68,13 +71,26 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}call_context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}call_context.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}zmqhandlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/${MODPY_PYCACHE}zmqhandlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/call_context.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/handlers.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/websocket.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/base/zmqhandlers.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/config_manager.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/contents_service/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/contents_service/v1.yaml
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/gateway_client/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/gateway_client/v1.yaml
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/kernel_actions/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/event_schemas/kernel_actions/v1.yaml
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/extension/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/extension/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/extension/${MODPY_PYCACHE}/
@@ -111,12 +127,15 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}connections.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}connections.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}gateway_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}gateway_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}managers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/${MODPY_PYCACHE}managers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/connections.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/gateway_client.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/handlers.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/gateway/managers.py
@@ -219,6 +238,14 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/contents/handlers.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/contents/largefilemanager.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/contents/manager.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/events/handlers.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}/
@@ -228,8 +255,25 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}kernelmanager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}kernelmanager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}channels.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/${MODPY_PYCACHE}channels.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/abc.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/base.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/connection/channels.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/handlers.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/kernelmanager.py
+lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernels/websocket.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernelspecs/
 lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernelspecs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_server/services/kernelspecs/${MODPY_PYCACHE}/