Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 27 Nov 2023 18:08:56 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 93d929c4a58d - main - devel/py-jupyter-collaboration: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency
Message-ID:  <202311271808.3ARI8uU4067868@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=93d929c4a58d637d6f46bee18449721fa26eac6b

commit 93d929c4a58d637d6f46bee18449721fa26eac6b
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-11-27 18:03:14 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.mk>
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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202311271808.3ARI8uU4067868>