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

[DH-194] jupyterlab 4.0.10 redux #5367

Merged
1 change: 1 addition & 0 deletions deployments/a11y/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dependencies:
- python==3.11.0
- git==2.40.0
- coverage==7.2.2
- jupyter-archive==3.4.0
- jupyter_server==2.7.0
- jupyter-book==0.15.1
- jupyter-resource-usage==0.7.1
Expand Down
17 changes: 9 additions & 8 deletions deployments/a11y/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
17 changes: 9 additions & 8 deletions deployments/astro/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
5 changes: 3 additions & 2 deletions deployments/astro/image/postBuild
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash
set -euo pipefail

jupyter contrib nbextensions install --sys-prefix --symlink
jupyter nbextensions_configurator enable --sys-prefix
# 2024-01-13 sknapp: incompatible due to notebook 7
# jupyter contrib nbextensions install --sys-prefix --symlink
# jupyter nbextensions_configurator enable --sys-prefix
5 changes: 3 additions & 2 deletions deployments/biology/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ COPY infra-requirements.txt /tmp/
RUN mamba env update -p ${CONDA_DIR} -f /tmp/environment.yml && \
mamba clean -afy

RUN jupyter contrib nbextensions install --sys-prefix --symlink && \
jupyter nbextensions_configurator enable --sys-prefix
# 2024-01-13 sknapp: incompatible due to notebook 7
# RUN jupyter contrib nbextensions install --sys-prefix --symlink && \
# jupyter nbextensions_configurator enable --sys-prefix

# Set CRAN mirror to rspm before we install anything
COPY Rprofile.site /usr/lib/R/etc/Rprofile.site
Expand Down
17 changes: 9 additions & 8 deletions deployments/biology/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
17 changes: 9 additions & 8 deletions deployments/cee/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
3 changes: 1 addition & 2 deletions deployments/data100/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies:
- python==3.11.0
- git==2.39.1
- jupyter-resource-usage==1.0.0
- jupyterlab==4.0.4
- jupyterlab==4.0.10
- jupyterlab-favorites==3.0.0
- jupyterlab_server==2.23.0
- jupyterlab_widgets==3.0.8
Expand All @@ -19,7 +19,6 @@ dependencies:
- ipywidgets==8.0.7
- jupysql==0.8.0
- jupyter-archive==3.4.0
- jupyterlab==4.0.4
- matplotlib==3.7.1
- mdit-py-plugins==0.4.0
- numpy==1.24.2
Expand Down
17 changes: 9 additions & 8 deletions deployments/data100/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
3 changes: 2 additions & 1 deletion deployments/data101/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ dependencies:
- ipympl==0.9.2
- ipyparallel==8.4.1
- jsonschema==4.17.3
- jupyter-archive==3.4.0
- jupyter-book==0.15.1
- jupyter-resource-usage==1.0.0
- jupyter_bokeh
- jupyterlab==4.0.4
- jupyterlab==4.0.10
- jupyterlab-favorites==3.0.0
- jupyterlab-geojson==3.2.0
- jupyterlab-variableinspector==3.0.9
Expand Down
17 changes: 9 additions & 8 deletions deployments/data101/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
3 changes: 2 additions & 1 deletion deployments/data102/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ dependencies:
- git==2.39.1
- bambi==0.12.0
- graphviz==8.0.3
- jupyter-archive==3.4.0
- jupyter-resource-usage==1.0.0
- jupyterlab==4.0.4
- jupyterlab==4.0.10
- jupyterlab-favorites==3.0.0
- jupyterlab_server==2.23.0
- jupyterlab_widgets==3.0.8
Expand Down
17 changes: 9 additions & 8 deletions deployments/data102/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
1 change: 1 addition & 0 deletions deployments/data8/image/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
# data8
- datascience==0.17.6
- folium==0.15.1
- jupyter-archive==3.4.0
- jupyterlab==4.0.10
- jupyter_server==2.7.0
- matplotlib==3.4.3
Expand Down
17 changes: 9 additions & 8 deletions deployments/data8/image/infra-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,25 @@
# everwhere one by one.

# FIXME: Freeze this to get exact versions of all dependencies
notebook==6.4.12
jupyterlab==3.4.5
retrolab==0.3.21
nbgitpuller==1.1.0
jupyter-resource-usage==0.6.1
notebook==7.0.6
jupyterlab==4.0.10
nbgitpuller==1.2.0
jupyter-resource-usage==1.0.1
# Matches version in images/hub/Dockerfile
jupyterhub==4.0.2
appmode==0.8.0
ipywidgets==7.7.2
ipywidgets==8.0.7
jupyter-tree-download==1.0.1
git-credential-helpers==0.2
# Enough people like this, let's load it in.
jupyter-contrib-nbextensions==0.5.1
jupyter_nbextensions_configurator==0.4.1
jupyter-contrib-nbextensions==0.7.0
jupyter_nbextensions_configurator==0.6.3
# Measure popularity of different packages in our hubs
# https://discourse.jupyter.org/t/request-for-implementation-instrument-libraries-actively-used-by-users-on-a-jupyterhub/7994?u=yuvipanda
git+https://github.com/shaneknapp/python-popularity-contest.git@add-error-handling
# RISE is useful for presentations - see https://github.com/berkeley-dsep-infra/datahub/issues/2527
RISE==5.7.1
# syncthing for dropbox-like functionality
jupyter-syncthing-proxy==1.0.3
# jupyter archival tool for easy user downloads
jupyter-archive==3.4.0
13 changes: 8 additions & 5 deletions deployments/datahub/images/default/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,14 @@ COPY environment.yml /tmp/environment.yml

RUN echo "/srv/conda/bin/mamba env update -p ${CONDA_DIR} -f /tmp/environment.yml" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash
RUN echo "/srv/conda/bin/mamba clean -afy" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash
RUN echo "/srv/conda/bin/pip install --no-cache -r /tmp/infra-requirements.txt" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash

RUN jupyter contrib nbextensions install --sys-prefix --symlink && \
jupyter nbextensions_configurator enable --sys-prefix
# 2024-01-13 sknapp: incompatible due to notebook 7
# RUN jupyter contrib nbextensions install --sys-prefix --symlink && \
# jupyter nbextensions_configurator enable --sys-prefix

# Used by MCB32, but incompatible with ipywidgets 8.x
RUN jupyter nbextension enable --py --sys-prefix qgrid
# RUN jupyter nbextension enable --py --sys-prefix qgrid

# install chromium browser for playwright
# https://github.com/berkeley-dsep-infra/datahub/issues/5062
Expand All @@ -154,8 +156,9 @@ RUN playwright install chromium
# Install IR kernelspec
RUN echo "/usr/bin/r -e \"IRkernel::installspec(user = FALSE, prefix='${CONDA_DIR}')\"" | /usr/bin/time -f "User\t%U\nSys\t%S\nReal\t%E\nCPU\t%P" /usr/bin/bash

COPY d8extension.bash /usr/local/sbin/d8extension.bash
RUN /usr/local/sbin/d8extension.bash
# 2024-01-13 sknapp: incompatible due to notebook 7
# COPY d8extension.bash /usr/local/sbin/d8extension.bash
# RUN /usr/local/sbin/d8extension.bash

ENV NLTK_DATA ${CONDA_DIR}/nltk_data
COPY connectors/text.bash /usr/local/sbin/connector-text.bash
Expand Down
Loading