git: 47cc91cec769 - main - devel/py-jupyter-collaboration: Allow build with py-pycrdt-websocket 0.14.0+

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=47cc91cec7695d820a2f4402e8ce35a9009241e7

commit 47cc91cec7695d820a2f4402e8ce35a9009241e7
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-07-07 14:50:37 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-07-07 14:51:02 +0000

    devel/py-jupyter-collaboration: Allow build with py-pycrdt-websocket 0.14.0+
    
    - Bump PORTREVISION for dependency and package change
    
    Obtained from:  https://github.com/jupyterlab/jupyter-collaboration/commit/86ef807c45658b91d865fc821de54839fd2522ba
---
 devel/py-jupyter-collaboration/Makefile           |  5 ++--
 devel/py-jupyter-collaboration/files/patch-pycrdt | 36 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/devel/py-jupyter-collaboration/Makefile b/devel/py-jupyter-collaboration/Makefile
index f014b52d4cc8..a1b58887e942 100644
--- a/devel/py-jupyter-collaboration/Makefile
+++ b/devel/py-jupyter-collaboration/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jupyter-collaboration
 PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI \
 		https://github.com/jupyterlab/jupyter-collaboration/releases/download/v${PORTVERSION}/
@@ -23,7 +23,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18.0:devel/py-jsonschema@${PY_
 		${PYTHON_PKGNAMEPREFIX}jupyter-server>=2.0.0<3.0.0:devel/py-jupyter-server@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-server-fileid>=0.7.0<1:devel/py-jupyter-server-fileid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jupyter-ydoc>=2.0.0<3.0.0:devel/py-jupyter-ydoc@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycrdt-websocket>=0.13.4<0.14.0:devel/py-pycrdt-websocket@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pycrdt>=0:devel/py-pycrdt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrdt-websocket>=0.14.0<0.15.0:devel/py-pycrdt-websocket@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
diff --git a/devel/py-jupyter-collaboration/files/patch-pycrdt b/devel/py-jupyter-collaboration/files/patch-pycrdt
new file mode 100644
index 000000000000..203290ab7562
--- /dev/null
+++ b/devel/py-jupyter-collaboration/files/patch-pycrdt
@@ -0,0 +1,36 @@
+Obtained from:	https://github.com/jupyterlab/jupyter-collaboration/commit/86ef807c45658b91d865fc821de54839fd2522ba
+
+--- jupyter_collaboration/handlers.py.orig	2020-02-02 00:00:00 UTC
++++ jupyter_collaboration/handlers.py
+@@ -14,9 +14,9 @@ from jupyter_ydoc import ydocs as YDOCS
+ from jupyter_server.base.handlers import APIHandler, JupyterHandler
+ from jupyter_server.utils import ensure_async
+ from jupyter_ydoc import ydocs as YDOCS
++from pycrdt import YMessageType, write_var_uint
+ from pycrdt_websocket.websocket_server import YRoom
+ from pycrdt_websocket.ystore import BaseYStore
+-from pycrdt_websocket.yutils import YMessageType, write_var_uint
+ from tornado import web
+ from tornado.websocket import WebSocketHandler
+ 
+--- pyproject.toml.orig	2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -29,7 +29,8 @@ dependencies = [
+ dependencies = [
+     "jupyter_server>=2.0.0,<3.0.0",
+     "jupyter_ydoc>=2.0.0,<3.0.0",
+-    "pycrdt-websocket>=0.13.4,<0.14.0",
++    "pycrdt",
++    "pycrdt-websocket>=0.14.0,<0.15.0",
+     "jupyter_events>=0.10.0",
+     "jupyter_server_fileid>=0.7.0,<1",
+     "jsonschema>=4.18.0"
+@@ -143,6 +144,8 @@ filterwarnings = [
+     "ignore:can't resolve package from __spec__ or __package__, falling back on __name__ and __path__:ImportWarning",
+     # see https://github.com/dateutil/dateutil/issues/1314
+     "ignore:.*datetime.utcfromtimestamp\\(\\) is deprecated.*:DeprecationWarning:",
++    # From anyio https://github.com/agronholm/anyio/pull/715
++    'ignore:Unclosed <MemoryObjectSendStream>:ResourceWarning',
+ ]
+ 
+ [tool.mypy]