git: 4a9b41ad962c - main - devel/py-nbdime: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 27 Nov 2023 18:09:03 UTC
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a9b41ad962cf80809520a865f02aa392dc69635 commit 4a9b41ad962cf80809520a865f02aa392dc69635 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-11-27 18:03:18 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-11-27 18:07:53 +0000 devel/py-nbdime: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency --- devel/py-nbdime/Makefile | 6 ++++-- devel/py-nbdime/files/patch-pyproject.toml | 9 +++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/devel/py-nbdime/Makefile b/devel/py-nbdime/Makefile index ea6a72588e94..d817dadbf2ad 100644 --- a/devel/py-nbdime/Makefile +++ b/devel/py-nbdime/Makefile @@ -13,8 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-jupyter-builder>=0.5:devel/py-hatch-jupyter-builder@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}hatchling>=1.5.0:devel/py-hatchling@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.0.0<5:devel/py-jupyterlab@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}hatchling>=1.5.0:devel/py-hatchling@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}colorama>=0:devel/py-colorama@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}gitpython>=0:devel/py-gitpython@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \ @@ -32,4 +31,7 @@ NO_ARCH= yes CPE_VENDOR= jupyter +post-extract: + @${RM} ${WRKSRC}/nbdime/labextension/schemas/nbdime-jupyterlab/package.json.orig + .include <bsd.port.mk> diff --git a/devel/py-nbdime/files/patch-pyproject.toml b/devel/py-nbdime/files/patch-pyproject.toml new file mode 100644 index 000000000000..cc0204cabf71 --- /dev/null +++ b/devel/py-nbdime/files/patch-pyproject.toml @@ -0,0 +1,9 @@ +--- pyproject.toml.orig 2020-02-02 00:00:00 UTC ++++ pyproject.toml +@@ -1,5 +1,5 @@ + [build-system] +-requires = ["hatchling>=1.5.0", "jupyterlab>=4.0.0,<5"] ++requires = ["hatchling>=1.5.0"] + build-backend = "hatchling.build" + + [project]