From nobody Tue Dec 31 16:05:11 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 4YMyVL6F4fz5jgZv; Tue, 31 Dec 2024 16:05:14 +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 4YMyVJ0wzXz49s6; Tue, 31 Dec 2024 16:05:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735661112; 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=T+oTqf15QC13KynSPQ0XhKgHAPMz/j8zLXHAMTTMsjA=; b=hhMEYn8wIRVSfu4A/lGC/IFgeJfPFHZu8eUwI2AyBDA3iOIfd/YUTn7eFbR3akinCClYHf 3kNM5FdQnuUjvTdWJ6hM0ZnZA4148CTgLsywJViwKj5ifGWB30zlVa3GVeeO3vvc4XQpFL 7HdQEcCYJzRBhQR4jZ03LysbUlmUh73SCED5VbmTmJ+eN4ZNLVyNE3iWGdeh/i5zlmvyw7 LU4+BR/AUFF7tPgkLlBNCIph8nZQMHWnKfda6zNG0lt1pIADUB+ZnuevR19EBW/yjpgD5c 2B5o6x2bgxWrtnpZRlUy0uAAWknaCi42IWEjpORt0wlOwvzXOabMU6pdVvdCVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735661112; 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=T+oTqf15QC13KynSPQ0XhKgHAPMz/j8zLXHAMTTMsjA=; b=dkXj1zgB+ycxAggl5Pbk/2OTZDmPx2g4FJob9QC62IqjGM1nV58REgAwsatgXCjAXWp28u IEylnHiTiZC6UMv8U/kiARx8n06RyzE55NLxPMvk0bfi/Rx11DGYvS1QEhX14N6+ncMP5V CEAPr0SWqTOUcj9AhyBVtrqGxlKXYNTqnOGwYqFyecx6vC8YP67QuAnxsc03M3SO8j+caM JpYEdH8KWa+/O214mVKWB0KW8jY77HvSWmQfUHXGV/3qVIKCe71rQVYVH9u7sdg+Qz7GMp 7llDENjMBiRxsSTFBaEyC2B4oTqDIAqeFOIzemis2R4iaQlL48jop5YcRl3q9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735661112; a=rsa-sha256; cv=none; b=jvsu0MCeuynQuT4Ea6A2oqcprLZJ+zYKwmislpjXw4OUGuPiXMpMlab60GcDVXieJ5rWPs evTawiRFGxbbLoNo7jb7F5/Af62zPf1IsYl8pReXYJWf5KFmpS/tkI6eUf5f0cIoAsRA3c KRorZ0P2CtREMzw15M5gw+sSNtdEIY1VkiXSgX4feaKEggg7Tz2UzW2QFFQ4foosC/hhgv OCriR4kefdVrq7giW74e5HGAGApYdpzC2rMLXn3nkb6KJ1ShRfOGQ3Vgub9aBl+TVIF/aW 2dgQhSmrBjsmagdAjC3e2vE27uJ9/mVdQsWbk695bUgAzEkVFIqHsKDoipa/Cw== 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 4YMyVJ0Xjzzmdl; Tue, 31 Dec 2024 16:05:12 +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 4BVG5Bma000040; Tue, 31 Dec 2024 16:05:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVG5Bb4000037; Tue, 31 Dec 2024 16:05:11 GMT (envelope-from git) Date: Tue, 31 Dec 2024 16:05:11 GMT Message-Id: <202412311605.4BVG5Bb4000037@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: c48b1a8339c0 - main - www/py-notebook: Update to 7.3.2 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: c48b1a8339c004b2b24a3852a999eac573733022 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c48b1a8339c004b2b24a3852a999eac573733022 commit c48b1a8339c004b2b24a3852a999eac573733022 Author: Po-Chuan Hsieh AuthorDate: 2024-12-31 15:55:50 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-12-31 15:55:50 +0000 www/py-notebook: Update to 7.3.2 - Update WWW - Clean up .orig files in the tarball Changes: https://github.com/jupyter/notebook/releases --- www/py-notebook/Makefile | 59 ++++++++++++++++++++---------- www/py-notebook/distinfo | 6 +-- www/py-notebook/files/patch-pyproject.toml | 18 --------- 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile index ca2f006bb3f2..10bbca6ef51d 100644 --- a/www/py-notebook/Makefile +++ b/www/py-notebook/Makefile @@ -1,42 +1,63 @@ PORTNAME= notebook -DISTVERSION= 7.2.2 -PORTREVISION= 1 +PORTVERSION= 7.3.2 CATEGORIES= www python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= python@FreeBSD.org COMMENT= Web-based notebook environment for interactive computing -WWW= https://jupyter.org/ +WWW= https://jupyter.org/ \ + https://jupyter-notebook.readthedocs.io/en/stable/ \ + https://github.com/jupyter/notebook LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}hatch-jupyter-builder>=0.5:devel/py-hatch-jupyter-builder@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hatchling>=1.11:devel/py-hatchling@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.2.0<4.4:devel/py-jupyterlab@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.3.4<4.4:devel/py-jupyterlab@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}jupyter-server>=2.4.0<3:devel/py-jupyter-server@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.2.0<4.4:devel/py-jupyterlab@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyterlab>=4.3.4<4.4:devel/py-jupyterlab@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jupyterlab-server>=2.27.1<3:devel/py-jupyterlab-server@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}notebook-shim>=0.2<0.3:devel/py-notebook-shim@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado>=6.2.0:www/py-tornado@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipykernel>0:devel/py-ipykernel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}nbval>0:devel/py-nbval@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-console-scripts>0:devel/py-pytest-console-scripts@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-tornasync>0:devel/py-pytest-tornasync@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyter-server>=2.4.0:devel/py-jupyter-server@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jupyterlab-server>=2.27.1:devel/py-jupyterlab-server@${PY_FLAVOR} - -USES= cpe desktop-file-utils python -USE_PYTHON= pep517 concurrent autoplist pytest # tests fail to run, see https://github.com/jupyter/notebook/issues/7451 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipykernel>=0:devel/py-ipykernel@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyter-server>=2.4.0<3:devel/py-jupyter-server@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jupyterlab-server>=2.27.1<3:devel/py-jupyterlab-server@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nbval>=0:devel/py-nbval@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-console-scripts>=0:devel/py-pytest-console-scripts@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-tornasync>=0:devel/py-pytest-tornasync@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} +# py-jupyter-server[test] +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}flaky>=0:devel/py-flaky@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pre-commit>=0:devel/py-pre-commit@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-jupyter>=0.7:devel/py-pytest-jupyter@${PY_FLAVOR} +# py-jupyterlab-server[test] +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}hatch>=0:devel/py-hatch@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openapi-core>=0.18.0:devel/py-openapi-core@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}openapi-spec-validator>=0.6.0<0.8.0:devel/py-openapi-spec-validator@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}requests-mock>=0:www/py-requests-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0:devel/py-ruamel.yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-spelling>=0:textproc/py-sphinxcontrib-spelling@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}strict-rfc3339>=0:devel/py-strict-rfc3339@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} + +USES= cpe desktop-file-utils python:3.9+ +USE_PYTHON= pep517 concurrent autoplist pytest NO_ARCH= yes CPE_VENDOR= jupyter -TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -TEST_WRKSRC= ${WRKSRC}/tests +post-extract: + @${FIND} ${WRKSRC} -name '*.orig' -delete + +.include + +.if ${PYTHON_REL} < 31000 +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-resources>=5.0:devel/py-importlib-resources@${PY_FLAVOR} +.endif -.include +.include diff --git a/www/py-notebook/distinfo b/www/py-notebook/distinfo index e53286ddfcc0..3b2275b7daef 100644 --- a/www/py-notebook/distinfo +++ b/www/py-notebook/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725416147 -SHA256 (notebook-7.2.2.tar.gz) = 2ef07d4220421623ad3fe88118d687bc0450055570cdd160814a59cf3a1c516e -SIZE (notebook-7.2.2.tar.gz) = 4948876 +TIMESTAMP = 1735228246 +SHA256 (notebook-7.3.2.tar.gz) = 705e83a1785f45b383bf3ee13cb76680b92d24f56fb0c7d2136fe1d850cd3ca8 +SIZE (notebook-7.3.2.tar.gz) = 12781804 diff --git a/www/py-notebook/files/patch-pyproject.toml b/www/py-notebook/files/patch-pyproject.toml deleted file mode 100644 index 2f542761bd25..000000000000 --- a/www/py-notebook/files/patch-pyproject.toml +++ /dev/null @@ -1,18 +0,0 @@ ---- pyproject.toml.orig 2020-02-02 00:00:00 UTC -+++ pyproject.toml -@@ -1,5 +1,5 @@ - [build-system] --requires = ["hatchling>=1.11", "jupyterlab>=4.2.0,<4.3"] -+requires = ["hatchling>=1.11", "jupyterlab>=4.2.0,<4.4"] - build-backend = "hatchling.build" - - [project] -@@ -32,7 +32,7 @@ dependencies = [ - ] - dependencies = [ - "jupyter_server>=2.4.0,<3", -- "jupyterlab>=4.2.0,<4.3", -+ "jupyterlab>=4.2.0,<4.4", - "jupyterlab_server>=2.27.1,<3", - "notebook_shim>=0.2,<0.3", - "tornado>=6.2.0",