From 23b6d0a7c297292bc169c705244deab24e66c434 Mon Sep 17 00:00:00 2001
From: daniel <daniel@openbsd.org>
Date: Thu, 28 Dec 2023 00:52:37 +0000
Subject: [PATCH] update py-jupyter_client to 8.1.0

Notably, this version fixes a crash caused by spyder when that app shuts
down.
---
 devel/py-jupyter_client/Makefile              | 19 +++---
 devel/py-jupyter_client/distinfo              |  4 +-
 .../patches/patch-jupyter_client_connect_py   |  6 +-
 devel/py-jupyter_client/pkg/PLIST             | 64 +------------------
 4 files changed, 15 insertions(+), 78 deletions(-)

diff --git a/devel/py-jupyter_client/Makefile b/devel/py-jupyter_client/Makefile
index f5b6f673bfb1..853d91176b75 100644
--- a/devel/py-jupyter_client/Makefile
+++ b/devel/py-jupyter_client/Makefile
@@ -1,9 +1,8 @@
 COMMENT =		Jupyter protocol implementation and client libraries
 
-MODPY_EGG_VERSION =	7.4.9
+MODPY_EGG_VERSION =	8.1.0
 DISTNAME =		jupyter_client-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
 
 CATEGORIES =		devel
 
@@ -16,25 +15,25 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 
+FLAVORS =		python3
+FLAVOR =		python3
+
 MODPY_PI =		Yes
 MODPY_PYBUILD =		hatchling
 MODPY_PYTEST_ARGS =	jupyter_client
 
 RUN_DEPENDS =		devel/py-dateutil${MODPY_FLAVOR}>=2.8.2 \
-			devel/py-entrypoints${MODPY_FLAVOR} \
-			devel/py-jupyter_core${MODPY_FLAVOR}>=4.9.2 \
-			devel/py-nest-asyncio${MODPY_FLAVOR}>=1.5.4 \
-			devel/py-traitlets${MODPY_FLAVOR} \
+			devel/py-jupyter_core${MODPY_FLAVOR}>=4.12 \
+			devel/py-traitlets${MODPY_FLAVOR}>=5.3 \
 			net/py-zmq${MODPY_FLAVOR}>=23.0 \
 			www/py-tornado${MODPY_FLAVOR}>=6.2
 
+# XXX 8.x+ needs pytest-jupyter which needs jupyter_server>=1.21.0
+NO_TEST = Yes
 TEST_DEPENDS =		devel/ipython${MODPY_FLAVOR} \
-			devel/py-ipykernel${MODPY_FLAVOR} \
+			devel/py-ipykernel${MODPY_FLAVOR}>=6.14 \
 			shells/bash
 
-FLAVORS =		python3
-FLAVOR =		python3
-
 PORTHOME =		${WRKDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-jupyter_client/distinfo b/devel/py-jupyter_client/distinfo
index d160e77e5f4d..ddb2d798d7e5 100644
--- a/devel/py-jupyter_client/distinfo
+++ b/devel/py-jupyter_client/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_client-7.4.9.tar.gz) = Ur4o4EFx8HrtjyDhYWpaVSq5/unLvmwYlq4XDDiA05I=
-SIZE (jupyter_client-7.4.9.tar.gz) = 329115
+SHA256 (jupyter_client-8.1.0.tar.gz) = P7q2QQCg3Kx3AbHg8aRBLxzLRVRv8q2bxPy+ThmASBE=
+SIZE (jupyter_client-8.1.0.tar.gz) = 335241
diff --git a/devel/py-jupyter_client/patches/patch-jupyter_client_connect_py b/devel/py-jupyter_client/patches/patch-jupyter_client_connect_py
index d0a4870228e4..ca78ab0b2888 100644
--- a/devel/py-jupyter_client/patches/patch-jupyter_client_connect_py
+++ b/devel/py-jupyter_client/patches/patch-jupyter_client_connect_py
@@ -7,9 +7,9 @@ Index: jupyter_client/connect.py
  import warnings
 +import sys
  from getpass import getpass
- from typing import Any
- from typing import cast
-@@ -164,7 +165,7 @@ def write_connection_file(
+ from typing import Any, Dict, List, Optional, Set, Tuple, Union, cast
+ 
+@@ -147,7 +148,7 @@ def write_connection_file(
      with secure_write(fname) as f:
          f.write(json.dumps(cfg, indent=2))
  
diff --git a/devel/py-jupyter_client/pkg/PLIST b/devel/py-jupyter_client/pkg/PLIST
index ca4324804be5..5b2b2df9a37e 100644
--- a/devel/py-jupyter_client/pkg/PLIST
+++ b/devel/py-jupyter_client/pkg/PLIST
@@ -10,7 +10,7 @@ lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dis
 lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dist-info/WHEEL
 lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
 lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dist-info/licenses/
-lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dist-info/licenses/COPYING.md
+lib/python${MODPY_VERSION}/site-packages/jupyter_client-${MODPY_EGG_VERSION}.dist-info/licenses/LICENSE
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_client/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -134,68 +134,6 @@ lib/python${MODPY_VERSION}/site-packages/jupyter_client/ssh/${MODPY_PYCACHE}tunn
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/ssh/${MODPY_PYCACHE}tunnel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/ssh/forward.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/ssh/tunnel.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}problemkernel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}problemkernel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}signalkernel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}signalkernel.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_adapter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_adapter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_client.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_connect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_connect.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_jsonutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_jsonutil.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelapp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelapp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelmanager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelmanager.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelspec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_kernelspec.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_localinterfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_localinterfaces.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_manager.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_multikernelmanager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_multikernelmanager.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_provisioning.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_provisioning.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_public_api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_public_api.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_restarter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_restarter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_session.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}test_ssh.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/conftest.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/problemkernel.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/signalkernel.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_adapter.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_client.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_connect.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_jsonutil.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_kernelapp.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_kernelmanager.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_kernelspec.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_localinterfaces.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_manager.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_multikernelmanager.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_provisioning.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_public_api.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_restarter.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_session.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/test_ssh.py
-lib/python${MODPY_VERSION}/site-packages/jupyter_client/tests/utils.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/threaded.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/utils.py
 lib/python${MODPY_VERSION}/site-packages/jupyter_client/win_interrupt.py