diff --git a/README.md b/README.md index 62903e05ab9ca836c5cbc804cc4a18ce87c444ff..8bf3ac20c430826bd2d6bd0958fb075fd433cf6b 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 cea9f724b87d876ab14d1b749691685b73695b16..b19764fbcf13c7e3634c0fbfe050878768ae1530 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 446d23996da8bffad6700e8d8d240d97641088e9..fcd27b51796d0830fbfde713da984f18556190a1 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 f2e78d495a04faa6e6838ebbec69daf395772e43..f2687f32e8878bb36f76e6cb14a4b09169e25f8b 100644 --- a/tangostationcontrol/VERSION +++ b/tangostationcontrol/VERSION @@ -1 +1 @@ -0.38.2 +0.38.3