From 3841f12089fea73666194beb87111701f50c9cb0 Mon Sep 17 00:00:00 2001 From: Jan David Mol <mol@astron.nl> Date: Wed, 22 May 2024 15:38:42 +0000 Subject: [PATCH] Upgrade Jupyter Labs to v4 --- README.md | 1 + docker/jupyter-lab/Dockerfile | 5 ++--- docker/jupyter-lab/requirements.txt | 2 +- tangostationcontrol/VERSION | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 62903e05a..8bf3ac20c 100644 --- a/README.md +++ b/README.md @@ -161,6 +161,7 @@ Next change the version in the following places: # Release Notes +* 0.38.3 Upgraded to JupyterLab v4 * 0.38.2 Fixed polling of some attributes required by Metadata device Wait 2s after enabling FPGA_processing_enable_RW to allow it to propagate * 0.38.1 Custom compiled casacore for improved beam-tracking performance diff --git a/docker/jupyter-lab/Dockerfile b/docker/jupyter-lab/Dockerfile index cea9f724b..b19764fbc 100644 --- a/docker/jupyter-lab/Dockerfile +++ b/docker/jupyter-lab/Dockerfile @@ -1,5 +1,4 @@ -# needs to stay v 3 until https://github.com/jupyterlab/jupyterlab-git/issues/1245 -FROM jupyter/scipy-notebook:lab-3.6.3 +FROM jupyter/scipy-notebook:latest USER root RUN --mount=type=cache,target=/var/cache/apt \ @@ -10,7 +9,7 @@ RUN --mount=type=cache,target=/var/cache/apt \ apt-get install -y git rsync USER ${NB_UID} -RUN mamba install --yes jupyterlab-git && \ +RUN mamba install --yes 'jupyterlab-git>=0.50.0' && \ mamba clean --all -f -y && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" diff --git a/docker/jupyter-lab/requirements.txt b/docker/jupyter-lab/requirements.txt index 446d23996..fcd27b517 100644 --- a/docker/jupyter-lab/requirements.txt +++ b/docker/jupyter-lab/requirements.txt @@ -3,7 +3,7 @@ ipykernel nbconvert notebook-as-pdf PyPDF2==2.12.1 # until https://github.com/betatim/notebook-as-pdf/issues/40 hits a notebook-as-pdf release -jupyterlab-git +jupyterlab-git >= 0.50.0 # BSD-3 # high-level access to station components lofar-station-client[tango] diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION index f2e78d495..f2687f32e 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.38.2 +0.38.3 -- GitLab