From nobody Sun Jul 07 14:54:02 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WH9Ht61Sgz5PqHy; Sun, 07 Jul 2024 14:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WH9Ht2FYMz4tDq; Sun, 7 Jul 2024 14:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720364042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJoCMZvvEQytQOZz/fcCpD/W0S5rfrdZSSiik6x+hUo=; b=AHgMwlqFKvexEB2HdDYPHd0J8Tl2tuHdwgoS/0HEFzDxUvyAhK4/5eCowv3POpZdK+PXmC UyHTHN7pnOHv9VkvWlNAWNUPoghr5xOFoSi1CbcJ6lFI7HdPZoAqw5IBTXm+yh3OrnzjX8 +xTMcx/5K+SOXMb+BotDpzpv6cMM9HUxmdr4p6fvSBhK/R3Bjv5mi+my2EnuQh6/f896L6 JhTeH3zvjV+8/YGG6HyPpyTAaG9dIaf+JaLigDw2zYiDhXMIf/c5ExPDVSZlBQidwxP67b g+kQShj1jG5duZxh3u77PdkojhDE52jWBs08i3Y9meX8kqK/kTvZj9N9pPwLPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720364042; a=rsa-sha256; cv=none; b=UR/dbXTa3nDsWUQw2ElgZn36FHEh2ZZYyMQkMz619WdqSHDNL5jmwSQqxi8ydlwHuvLNTd fhWxEUt4BhheIfgzqMkFRLqZ/uzKN1oVs05pzQfFDqLFXJff3/T21icThLshc4yKtGW8WQ JBIpHNaajADfxqglUw2L4F4TyrDdKHYTD1n7wxWZUSjAqpwmFdaSMnyyVjAiMxo2460tog XK0M9tGtCZ92yvzzSzyd3ZjL0D5eM7svTWdTdru3iufMe/SHb0n2l/FL99ysjvreqvuQtV jQaDj/br2/sCiWAXDh3BOvOaa62mNRx2rTqCAOqnNXS4LqdRMiP8DValtF7I/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720364042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJoCMZvvEQytQOZz/fcCpD/W0S5rfrdZSSiik6x+hUo=; b=h6sGF6LLksKx+lQuYfWmPW+ojOqa8vSwv2+4cov00x6CYB3nQQaiJAzlxhrs2r1lgc4Uv5 JS5mB2MqGJg6J9W4yDuOzd3lEz9weysu+s8JiYTIjHKEM/6xI3dvZqyDoXeUV03n59iU8E 1e4QrM+SmvKtlq3C0+a76LZavwuGT/1ekEh1Tqn8ryQgm/taUIUuilixZ9yunCvHbkQufr 5HjiZPoL2L4Vi+o8uVDXOQcq1f+BQBisuIyMnnas2HpI/055KqfvJMrTlqRAud4z9E110z QXRx88hz6JtaAwhww93owjRj+bU9PUa6G3pEI9bIVQ3AKGKNF4Masw2LN3oCoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WH9Ht1qK9z1Qt7; Sun, 7 Jul 2024 14:54:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 467Es2ng082263; Sun, 7 Jul 2024 14:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 467Es2R2082260; Sun, 7 Jul 2024 14:54:02 GMT (envelope-from git) Date: Sun, 7 Jul 2024 14:54:02 GMT Message-Id: <202407071454.467Es2R2082260@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 47cc91cec769 - main - devel/py-jupyter-collaboration: Allow build with py-pycrdt-websocket 0.14.0+ List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47cc91cec7695d820a2f4402e8ce35a9009241e7 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=47cc91cec7695d820a2f4402e8ce35a9009241e7 commit 47cc91cec7695d820a2f4402e8ce35a9009241e7 Author: Po-Chuan Hsieh AuthorDate: 2024-07-07 14:50:37 +0000 Commit: Po-Chuan Hsieh 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 :ResourceWarning', + ] + + [tool.mypy]