Skip to content

JupyterLab 3.0 and other updates #1222

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

Merged
merged 2 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from all 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 base-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Ubuntu 20.04 (focal)
# https://hub.docker.com/_/ubuntu/?tab=tags&name=focal
# OS/ARCH: linux/amd64
ARG ROOT_CONTAINER=ubuntu:focal-20201106@sha256:4e4bc990609ed865e07afc8427c30ffdddca5153fd4e82c20d8f0783a291e241
ARG ROOT_CONTAINER=ubuntu:focal-20210119@sha256:3093096ee188f8ff4531949b8f6115af4747ec1c58858c091c8cb4579c39cc4e

ARG BASE_CONTAINER=$ROOT_CONTAINER
FROM $BASE_CONTAINER
Expand Down Expand Up @@ -135,7 +135,7 @@ RUN conda install --quiet --yes \
'jedi=0.17.2' \
'notebook=6.2.0' \
'jupyterhub=1.3.0' \
'jupyterlab=2.2.9' && \
'jupyterlab=3.0.5' && \
conda clean --all -f -y && \
npm cache clean --force && \
jupyter notebook --generate-config && \
Expand Down
2 changes: 1 addition & 1 deletion datascience-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ RUN conda install --quiet --yes \
'r-rsqlite=2.2*' \
'r-shiny=1.5*' \
'r-tidyverse=1.3*' \
'rpy2=3.3*' && \
'rpy2=3.4*' && \
conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"
Expand Down
3 changes: 2 additions & 1 deletion r-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ RUN conda install --quiet --yes \
'r-tidymodels=0.1*' \
&& \
conda clean --all -f -y && \
fix-permissions "${CONDA_DIR}"
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"

# Install e1071 R package (dependency of the caret R package)
RUN conda install --quiet --yes r-e1071
24 changes: 5 additions & 19 deletions scipy-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,43 +22,29 @@ RUN conda install --quiet --yes \
'bottleneck=1.3.*' \
'cloudpickle=1.6.*' \
'cython=0.29.*' \
'dask=2020.12.*' \
'dask=2021.1.*' \
'dill=0.3.*' \
'h5py=3.1.*' \
'ipywidgets=7.6.*' \
'ipympl=0.5.*'\
'ipympl=0.6.*'\
'matplotlib-base=3.3.*' \
'numba=0.52.*' \
'numexpr=2.7.*' \
'pandas=1.1.*' \
'pandas=1.2.*' \
'patsy=0.5.*' \
'protobuf=3.14.*' \
'pytables=3.6.*' \
'scikit-image=0.18.*' \
'scikit-learn=0.24.*' \
'scipy=1.5.*' \
'scipy=1.6.*' \
'seaborn=0.11.*' \
'sqlalchemy=1.3.*' \
'statsmodels=0.12.*' \
'sympy=1.7.*' \
'vincent=0.4.*' \
'widgetsnbextension=3.5.*'\
'xlrd=1.2.*' \
&& \
'xlrd=2.0.*' && \
conda clean --all -f -y && \
# Activate ipywidgets extension in the environment that runs the notebook server
jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
# Also activate ipywidgets extension for JupyterLab
# Check this URL for most recent compatibilities
# https://github.com/jupyter-widgets/ipywidgets/tree/master/packages/jupyterlab-manager
jupyter labextension install @jupyter-widgets/jupyterlab-manager@^2.0.0 --no-build && \
jupyter labextension install @bokeh/jupyter_bokeh@^2.0.0 --no-build && \
jupyter labextension install jupyter-matplotlib@^0.7.2 --no-build && \
jupyter lab build -y && \
jupyter lab clean -y && \
npm cache clean --force && \
rm -rf "/home/${NB_USER}/.cache/yarn" && \
rm -rf "/home/${NB_USER}/.node-gyp" && \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"

Expand Down
9 changes: 8 additions & 1 deletion scipy-notebook/test/test_extensions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
LOGGER = logging.getLogger(__name__)


@pytest.mark.skip(reason="Not yet compliant with JupyterLab 3")
@pytest.mark.parametrize(
"extension",
[
Expand All @@ -16,7 +17,13 @@
],
)
def test_check_extension(container, extension):
"""Basic check of each extension"""
"""Basic check of each extension

The list of extensions can be obtained through this command

$ jupyter labextension list

"""
LOGGER.info(f"Checking the extension: {extension} ...")
c = container.run(
tty=True, command=["start.sh", "jupyter", "labextension", "check", extension]
Expand Down
2 changes: 1 addition & 1 deletion tensorflow-notebook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ LABEL maintainer="Jupyter Project <[email protected]>"

# Install Tensorflow
RUN pip install --quiet --no-cache-dir \
'tensorflow==2.4.0' && \
'tensorflow==2.4.1' && \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"