From nobody Mon Nov 27 18:08:56 2023 X-Original-To: dev-commits-ports-main@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 4SfD9h4NkHz52N5m; Mon, 27 Nov 2023 18:08:56 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SfD9h322Qz4QWp; Mon, 27 Nov 2023 18:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108536; 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=RMjhUXmEMlQCeNLCcMbKBs5NQ/DiWobojvnqLse/C/4=; b=OSTZWKqjof9VFnISkZWuwAGN3Hnb9JVkDlsLXI1Gb/0rA8Rmxz/oLpXzd46W+9Xwp8C+t9 reOg1Byre3oqHX73QQtgshGS9Xv7HyVjwVor+BsexnryHl/m6f9wktQ11cCjV4v+usJ0Nk 9jVwJ92kougDOagAZT4o5aKSdr5gmseO1nGTVzzm62fTrCVNnxGpSMYWIrSLbaD/TdtqJy GiiJPCADZy22aZsDcPUs6b0D8CX/aS1Gwt5JKc0AX4f97YzK335JTPU0ji1iTCQTy9U8vt enVeC4b3Xb422SZmgIILXDamlA2zcRedPbI47eVV8dRqYrxhhm8mCyBDX/9M0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108536; 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=RMjhUXmEMlQCeNLCcMbKBs5NQ/DiWobojvnqLse/C/4=; b=bZU4Xg2A8SOSCVJE6lXpdqLq8b+aJrsGh/g37N6w5SGxZvRr0nvUE84dpnyMtIplPYKSoK WNkB8XliiklMPh71cKfynS/D6V8hGkjMmkyep5af5eqpBhT9Pd/mkSV/X2j/RKsJGBUhhv Wn7QOncWraqq5RMg38SgbycY6OelBcKmD/N9AG/h7CSJt/ZFcxDcgX8Qv2r9nnMcWx9EEJ BXiyT2Age/D9Xj+YLlrgz8cUtRm4XwsuJ3TgFeJNWGilQEtyhSBSC5lQk+QvA71h75M6Yn s6Slj6wwcFK/I/+sc4ipuj5/yoretwwYNPTomC7bgj3yI3J2onOIfHev8Jhtcw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701108536; a=rsa-sha256; cv=none; b=AeXzkEc3ASsncTToEY2xEF4kTuKtQThkPkLyCopux2TRXgsxxtj6lqewZYq3oKKSmr0iB9 8ON6leIRduI2TXenPPwPOZHVY7LR7oKA6cKYveS8QjhZK1QDQnfnZgslOWrjmvYauLj0mF hlEYvJbcjo8IFDdNTY7d+iW7WCR2AbZmNAflsMqey+Ipa+5iSJr3jPtQONMem6IwBYgpFx Tieegnq7V594JA8+3d7m4jJ32M1SIZ7Lud0cT7bjLsw+WKMkcQYLkZecsRF3MKBMl7S1M2 Py1wrkxRXODAb1FweA4ENJY4v+hcJKMUibpyekf6RgVfYJ8+/bHLGT4qBl+Wvg== 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 4SfD9h267szpTj; Mon, 27 Nov 2023 18:08:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ARI8urA067871; Mon, 27 Nov 2023 18:08:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARI8uU4067868; Mon, 27 Nov 2023 18:08:56 GMT (envelope-from git) Date: Mon, 27 Nov 2023 18:08:56 GMT Message-Id: <202311271808.3ARI8uU4067868@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: 93d929c4a58d - main - devel/py-jupyter-collaboration: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 93d929c4a58d637d6f46bee18449721fa26eac6b Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=93d929c4a58d637d6f46bee18449721fa26eac6b commit 93d929c4a58d637d6f46bee18449721fa26eac6b Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 18:03:14 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-11-27 18:07:52 +0000 devel/py-jupyter-collaboration: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency --- devel/py-jupyter-collaboration/Makefile | 6 ++++-- devel/py-jupyter-collaboration/files/patch-pyproject.toml | 11 +++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/devel/py-jupyter-collaboration/Makefile b/devel/py-jupyter-collaboration/Makefile index b4ccf7b8e10c..754dff04c7a3 100644 --- a/devel/py-jupyter-collaboration/Makefile +++ b/devel/py-jupyter-collaboration/Makefile @@ -15,8 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-jupyter-builder>=0.5:devel/py-hatch-jupyter-builder@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatch-nodejs-version>=0:devel/py-hatch-nodejs-version@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hatchling>=1.4.0:devel/py-hatchling@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.0.0:devel/py-jupyterlab@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}hatchling>=1.4.0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jsonschema>=4.18.0:devel/py-jsonschema@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter-events>=0.7.0:devel/py-jupyter-events@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyter-server>=2.0.0<3.0.0:devel/py-jupyter-server@${PY_FLAVOR} \ @@ -29,4 +28,7 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes +post-extract: + @${RM} ${WRKSRC}/jupyter_collaboration/labextension/schemas/@jupyter/collaboration-extension/package.json.orig + .include diff --git a/devel/py-jupyter-collaboration/files/patch-pyproject.toml b/devel/py-jupyter-collaboration/files/patch-pyproject.toml new file mode 100644 index 000000000000..1b6a0b72e0ff --- /dev/null +++ b/devel/py-jupyter-collaboration/files/patch-pyproject.toml @@ -0,0 +1,11 @@ +--- pyproject.toml.orig 2020-02-02 00:00:00 UTC ++++ pyproject.toml +@@ -3,7 +3,7 @@ + + [build-system] + build-backend = "hatchling.build" +-requires = ["hatchling>=1.4.0", "hatch-nodejs-version", "jupyterlab>=4.0.0"] ++requires = ["hatchling>=1.4.0", "hatch-nodejs-version"] + + [project] + name = "jupyter_collaboration"