From nobody Mon Nov 27 18:09:03 2023 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 4SfD9q3Dktz52Myh; Mon, 27 Nov 2023 18:09:03 +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 4SfD9q2581z4QkC; Mon, 27 Nov 2023 18:09:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108543; 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=5XfYq5ytiGENUit1uu9DoLikfsdb7X1H+fDq9qzlZEU=; b=KlWBqFC4zA8kiL+9xNUTXyn9JzQqMAdtX/G7cnjOaUQC9/RmpIo1Hm8a/dvhclacizaULs tbJNXUHrb8j8/tpZPnpFszv41M/AAC3mbFNLsQqrMiSjUK5lYbs5BsfDPATnCuKxQxoIoX 1qGIi5+7h9Kgu/M6O0VixBW88RElzAeht7LhwMsXBsInpx4nz5LBYmVdvdSqoYYYPzlcWA tCOP09Mjg3P4f1doxTbvfVfll3IVUPpWVLGmMeluIBp0LpzhazWAFbO3qL688tnip5vWNM TbYOmoXBKGl048fl6DywKd1gK1/ze0HnJpnnUo8SGez65dXksRVh0e4ekdP8eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701108543; 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=5XfYq5ytiGENUit1uu9DoLikfsdb7X1H+fDq9qzlZEU=; b=YFYBSH56yRPTzmAv5+sHNuT6OI7cqF5yq5OaSExYuNKU6uOkWX7W26CLOU8fCcv5QjEIU3 eVQfVCasvKN7JkeidXAnaS993tgjuU6rQs2AMRZ64HUJuENsgsTNqlBipIDtA33xkVMCtg 5zzo4sjhZtjCv39knWfvGrh4h4ZQNCX2vw2BteHIwSH9DkbmjeMhdiHOjr2EHWQOGKBVQ/ oS3ui+QUgTSP6bx2v+RSKbFlEf2MCcvw+XSCf5ltPZXKAzkPxaQbvnPe4v6WEtEarbeU29 +tQqJNYsyWBmYiYXHYokL2PxzVfHykhnUGfPLAMa8EUKNeHGk3F54EjpHwm6AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701108543; a=rsa-sha256; cv=none; b=Ab/o1aTpb3cWbIPx/u1x+e79+YZaZEMY9MjPXMyoOkY7y3gPqzVOCJh1+d2wLgkfcY3Chu /LAEYdYe+suxUx51U0POU3g0iAO+vbx7BkYFsSgIIoUr+bEMD34FqAvBpS9Fb8Sr9uXKaI NXlPjvnvpIJp6ePda0bfi4IXqU2ztsWDkruIxlMmo1fK+z6N7D+xTKbmI89k0RP06m1OgW WyUEdo0q4ZwsSJbfgZu1CPehchgS2t1++WEvcUXoxVWG3Zv8f+mBJ8uobWIqIE3TAru7lG VifF/y4HL4vh8Qub8F7Lbxz8LGb/2t7/HwwWdvpAyE74ffY2DC0+56txFN3pwg== 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 4SfD9q14YhzpKQ; Mon, 27 Nov 2023 18:09:03 +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 3ARI93x3068143; Mon, 27 Nov 2023 18:09:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ARI93Al068140; Mon, 27 Nov 2023 18:09:03 GMT (envelope-from git) Date: Mon, 27 Nov 2023 18:09:03 GMT Message-Id: <202311271809.3ARI93Al068140@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: 4a9b41ad962c - main - devel/py-nbdime: Remove py-jupyterlab from BUILD_DEPENDS to avoid cyclic dependency 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 4a9b41ad962cf80809520a865f02aa392dc69635 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a9b41ad962cf80809520a865f02aa392dc69635 commit 4a9b41ad962cf80809520a865f02aa392dc69635 Author: Po-Chuan Hsieh AuthorDate: 2023-11-27 18:03:18 +0000 Commit: Po-Chuan Hsieh 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 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]