Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

notebook 7 #1363

Merged
merged 6 commits into from
Sep 15, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions repo2docker/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.10-linux-64.lock

Large diffs are not rendered by default.

72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.10-linux-aarch64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.10.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.11-linux-64.lock

Large diffs are not rendered by default.

72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.11-linux-aarch64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.11.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.12-linux-64.lock

Large diffs are not rendered by default.

72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.12-linux-aarch64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.12.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.8-linux-64.lock

Large diffs are not rendered by default.

72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.8-linux-aarch64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.8.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.9-linux-64.lock

Large diffs are not rendered by default.

72 changes: 35 additions & 37 deletions repo2docker/buildpacks/conda/environment.py-3.9-linux-aarch64.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions repo2docker/buildpacks/conda/environment.py-3.9.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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
2 changes: 1 addition & 1 deletion repo2docker/buildpacks/conda/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
@@ -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
3 changes: 1 addition & 2 deletions tests/venv/binder-dir/verify
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion tests/venv/postBuild/postBuild
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tests/venv/postBuild/requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ipyleaflet
jupyter-collaboration
2 changes: 1 addition & 1 deletion tests/venv/postBuild/verify
Original file line number Diff line number Diff line change
@@ -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