git: c48b1a8339c0 - main - www/py-notebook: Update to 7.3.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Tue, 31 Dec 2024 16:05:11 UTC
The branch main has been updated by sunpoet:

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

commit c48b1a8339c004b2b24a3852a999eac573733022
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-12-31 15:55:50 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 31000
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}importlib-resources>=5.0:devel/py-importlib-resources@${PY_FLAVOR}
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
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",