jupyterhub · manics · Sep 15, 2024 · Aug 8, 2024 · Aug 8, 2024 · Aug 8, 2024
diff --git a/repo2docker/app.py b/repo2docker/app.py
@@ -662,8 +662,8 @@ def start_container(self):
                 "notebook",
                 "--ip=0.0.0.0",
                 f"--port={container_port}",
-                f"--NotebookApp.custom_display_url=http://{host_name}:{host_port}",
-                "--NotebookApp.default_url=/lab",
+                f"--ServerApp.custom_display_url=http://{host_name}:{host_port}",
+                "--ServerApp.default_url=/lab",
             ]
         else:
             # run_cmd given by user, if port is also given then pass it on

diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.10.yml b/repo2docker/buildpacks/conda/environment.py-3.10.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2024-07-08 09:47:05 UTC
+# Generated on 2024-08-08 10:41:44 UTC
 channels:
 - conda-forge
 dependencies:
@@ -12,4 +12,4 @@ dependencies:
 - jupyter_server==2.*     # https://github.com/jupyter-server/jupyter_server
 - jupyterhub-singleuser==5.*     # https://github.com/jupyterhub/jupyterhub
 - jupyterlab==4.*     # https://github.com/jupyterlab/jupyterlab
-- notebook==6.*     # https://github.com/jupyter/notebook
+- notebook==7.*     # https://github.com/jupyter/notebook
diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.11.yml b/repo2docker/buildpacks/conda/environment.py-3.11.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2024-07-08 09:47:29 UTC
+# Generated on 2024-08-08 10:42:10 UTC
 channels:
 - conda-forge
 dependencies:
@@ -12,4 +12,4 @@ dependencies:
 - jupyter_server==2.*     # https://github.com/jupyter-server/jupyter_server
 - jupyterhub-singleuser==5.*     # https://github.com/jupyterhub/jupyterhub
 - jupyterlab==4.*     # https://github.com/jupyterlab/jupyterlab
-- notebook==6.*     # https://github.com/jupyter/notebook
+- notebook==7.*     # https://github.com/jupyter/notebook
diff --git a/repo2docker/buildpacks/conda/environment.py-3.12-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.12-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.12-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.12-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.12.yml b/repo2docker/buildpacks/conda/environment.py-3.12.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2024-07-08 09:47:52 UTC
+# Generated on 2024-08-08 10:42:36 UTC
 channels:
 - conda-forge
 dependencies:
@@ -12,4 +12,4 @@ dependencies:
 - jupyter_server==2.*     # https://github.com/jupyter-server/jupyter_server
 - jupyterhub-singleuser==5.*     # https://github.com/jupyterhub/jupyterhub
 - jupyterlab==4.*     # https://github.com/jupyterlab/jupyterlab
-- notebook==6.*     # https://github.com/jupyter/notebook
+- notebook==7.*     # https://github.com/jupyter/notebook
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.8.yml b/repo2docker/buildpacks/conda/environment.py-3.8.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2024-07-08 09:46:18 UTC
+# Generated on 2024-08-08 10:40:51 UTC
 channels:
 - conda-forge
 dependencies:
@@ -12,4 +12,4 @@ dependencies:
 - jupyter_server==2.*     # https://github.com/jupyter-server/jupyter_server
 - jupyterhub-singleuser==5.*     # https://github.com/jupyterhub/jupyterhub
 - jupyterlab==4.*     # https://github.com/jupyterlab/jupyterlab
-- notebook==6.*     # https://github.com/jupyter/notebook
+- notebook==7.*     # https://github.com/jupyter/notebook
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock b/repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock
diff --git a/repo2docker/buildpacks/conda/environment.py-3.9.yml b/repo2docker/buildpacks/conda/environment.py-3.9.yml
@@ -1,5 +1,5 @@
 # AUTO GENERATED FROM environment.yml, DO NOT MANUALLY MODIFY
-# Generated on 2024-07-08 09:46:42 UTC
+# Generated on 2024-08-08 10:41:18 UTC
 channels:
 - conda-forge
 dependencies:
@@ -12,4 +12,4 @@ dependencies:
 - jupyter_server==2.*     # https://github.com/jupyter-server/jupyter_server
 - jupyterhub-singleuser==5.*     # https://github.com/jupyterhub/jupyterhub
 - jupyterlab==4.*     # https://github.com/jupyterlab/jupyterlab
-- notebook==6.*     # https://github.com/jupyter/notebook
+- notebook==7.*     # https://github.com/jupyter/notebook
diff --git a/repo2docker/buildpacks/conda/environment.yml b/repo2docker/buildpacks/conda/environment.yml
@@ -10,4 +10,4 @@ dependencies:
   - jupyter_server==2.*   # https://github.com/jupyter-server/jupyter_server
   - jupyterhub-singleuser==5.*   # https://github.com/jupyterhub/jupyterhub
   - jupyterlab==4.*   # https://github.com/jupyterlab/jupyterlab
-  - notebook==6.*   # https://github.com/jupyter/notebook
+  - notebook==7.*   # https://github.com/jupyter/notebook
diff --git a/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt b/tests/pipfile/py2-with-server-and-kernel-req/requirements3.txt
@@ -1,3 +1,3 @@
-# install this in the environment in which the notebook server
-# is running nbgitpuller does not work with Python 2
-nbgitpuller==0.6.1
+# install this in the environment in which the notebook server is running
+# nbgitpuller does not work with Python 2
+nbgitpuller
diff --git a/tests/venv/binder-dir/verify b/tests/venv/binder-dir/verify
@@ -2,7 +2,6 @@
 set -euo pipefail
 which gfortran
 test -z $(pip list | grep scipy)
-jupyter nbextension list
-jupyter nbextension list | grep 'jupyter-leaflet' | grep enabled
+pip list | grep leaflet
 
 grep 'Done!' $HOME/postbuild.txt
diff --git a/tests/venv/postBuild/postBuild b/tests/venv/postBuild/postBuild
@@ -1,4 +1,4 @@
 #!/bin/bash
-jupyter nbextension enable --py --sys-prefix ipyleaflet
+jupyter server extension disable --sys-prefix jupyter_collaboration
 npm install --global configurable-http-proxy
 npm cache clean --force
diff --git a/tests/venv/postBuild/requirements.txt b/tests/venv/postBuild/requirements.txt
@@ -1 +1 @@
-ipyleaflet
+jupyter-collaboration
diff --git a/tests/venv/postBuild/verify b/tests/venv/postBuild/verify
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -euo pipefail
-jupyter nbextension list | grep 'jupyter-leaflet' | grep enabled
+jupyter server extension list 2>&1 | grep 'jupyter_collaboration' | grep disabled
 which configurable-http-proxy