Here are 4 new ports needed to update jupyter-notebook from v6.3.0 to 
v6.5.6 (the final release before the 7.x series)

and also one port needed to update py-nbformat from v5.0.7 to 5.1.0 and 
beyond.

Here is the dependency tree:

devel/py-nbformat:
        -> textproc/py-fastjsonschema

www/jupyter-notebook:
        -> devel/py-jupyter_packaging
        -> devel/py-nbclassic
                -> devel/py-notebook_shim

ok to import these new ports?

And shown below is the diff for jupter-notebook itself (minus the PLIST 
diff to keep this email short)

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/jupyter-notebook/Makefile,v
diff -u -p -u -r1.25 Makefile
--- Makefile    26 Sep 2023 03:06:00 -0000      1.25
+++ Makefile    21 Dec 2023 01:13:09 -0000
@@ -1,9 +1,8 @@
 COMMENT =              web-based notebook for interactive computing
 
-MODPY_EGG_VERSION =    6.3.0
+MODPY_EGG_VERSION =    6.5.6
 DISTNAME =             notebook-${MODPY_EGG_VERSION}
 PKGNAME =              jupyter-notebook-${MODPY_EGG_VERSION}
-REVISION =             0
 
 CATEGORIES =           www devel
 
@@ -16,14 +15,20 @@ MODULES =           lang/python
 
 MODPY_PI =             Yes
 MODPY_PYBUILD =                setuptools
+# XXX skip selenium tests as recommended
+MODPY_PYTEST_ARGS =    --ignore notebook/tests/selenium
+
+BUILD_DEPENDS =                
devel/py-jupyter_packaging${MODPY_FLAVOR}>=0.9,<2 \
+                       devel/py-nbclassic${MODPY_FLAVOR}>=0.4.7
 
 RUN_DEPENDS =          devel/py-ipykernel${MODPY_FLAVOR} \
                        devel/py-ipython_genutils${MODPY_FLAVOR} \
                        devel/py-jupyter_client${MODPY_FLAVOR}>=5.3.4 \
                        devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.1 \
-                       devel/py-nbconvert${MODPY_FLAVOR} \
+                       devel/py-nbconvert${MODPY_FLAVOR}>=5 \
                        devel/py-nbformat${MODPY_FLAVOR} \
-                       devel/py-send2trash${MODPY_FLAVOR}>=1.5.0 \
+                       devel/py-nest-asyncio${MODPY_FLAVOR}>=1.5 \
+                       devel/py-send2trash${MODPY_FLAVOR}>=1.8.0 \
                        devel/py-traitlets${MODPY_FLAVOR}>=4.2.1 \
                        net/py-zmq${MODPY_FLAVOR}>=17 \
                        security/py-argon2-cffi${MODPY_FLAVOR} \
@@ -33,21 +38,14 @@ RUN_DEPENDS =               devel/py-ipykernel${MODPY
                        www/py-tornado${MODPY_FLAVOR}>=6.1
 
 TEST_DEPENDS =         devel/py-coverage${MODPY_FLAVOR} \
-                       devel/py-nose${MODPY_FLAVOR} \
-                       devel/py-nose-warnings-filters${MODPY_FLAVOR} \
                        devel/py-nbval${MODPY_FLAVOR} \
+                       devel/py-test-cov${MODPY_FLAVOR} \
                        www/py-requests${MODPY_FLAVOR} \
                        www/py-requests-unixsocket${MODPY_FLAVOR} \
                        www/py-selenium${MODPY_FLAVOR}
 
 # XXX once we have a port of pandoc, we can make docs.
 
-# XXX exclude selenium tests as recommended, and exclude tests that use
-# send2trash as they error out with "Trashing on system internal mounts is not
-# supported".
-do-test:
-       cd ${WRKSRC} && env LC_CTYPE=C.UTF-8 HOME=${WRKSRC} \
-               ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} notebook -v \
-               --exclude=delete --exclude=follow_file --exclude=selenium
+PORTHOME =             ${WRKDIR}
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/jupyter-notebook/distinfo,v
diff -u -p -u -r1.11 distinfo
--- distinfo    4 Sep 2023 00:56:02 -0000       1.11
+++ distinfo    21 Dec 2023 01:13:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (notebook-6.3.0.tar.gz) = y8k5jWyBRz6c24kdLK6cDTcY/KKJ3abSbfXLZg/K3H0=
-SIZE (notebook-6.3.0.tar.gz) = 13922153
+SHA256 (notebook-6.5.6.tar.gz) = tGJaS3pZeDndMVaxQNW6LHEjdh+YJFoykPZ6i47gSNk=
+SIZE (notebook-6.5.6.tar.gz) = 5786735
Index: patches/patch-notebook_notebookapp_py
===================================================================
RCS file: patches/patch-notebook_notebookapp_py
diff -N patches/patch-notebook_notebookapp_py
--- patches/patch-notebook_notebookapp_py       26 Sep 2023 03:06:00 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-repair with traitlets 5.10
-
-Index: notebook/notebookapp.py
---- notebook/notebookapp.py.orig
-+++ notebook/notebookapp.py
-@@ -1388,7 +1388,6 @@ class NotebookApp(JupyterApp):
-             # and allow jupyter_server contents managers to pass
-             # through. If jupyter_server is not installed, this class
-             # will be ignored.
--            'jupyter_server.contents.services.managers.ContentsManager'
-         ],
-         config=True,
-         help=_('The notebook manager class to use.')
Index: patches/patch-notebook_services_sessions_sessionmanager_py
===================================================================
RCS file: patches/patch-notebook_services_sessions_sessionmanager_py
diff -N patches/patch-notebook_services_sessions_sessionmanager_py
--- patches/patch-notebook_services_sessions_sessionmanager_py  26 Sep 2023 
03:06:00 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-repair with traitlets 5.10
-
-Index: notebook/services/sessions/sessionmanager.py
---- notebook/services/sessions/sessionmanager.py.orig
-+++ notebook/services/sessions/sessionmanager.py
-@@ -31,7 +31,6 @@ class SessionManager(LoggingConfigurable):
-             # and allow jupyter_server contents managers to pass
-             # through. If jupyter_server is not installed, this class
-             # will be ignored.
--            'jupyter_server.services.contents.manager.ContentsManager'
-         ]
-     )
- 

Attachment: notebook_shim.tgz
Description: Binary data

Attachment: nbclassic.tgz
Description: Binary data

Attachment: jupyter_packaging.tgz
Description: Binary data

Attachment: fastjsonschema.tgz
Description: Binary data

Reply via email to