From 08869722f20361b2e021d8673228ad238ab2f7a8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 24 Nov 2023 12:43:10 +0000
Subject: [PATCH] Fix missing tango in Jupyter notebooks

---
 README.md                                   | 1 +
 docker-compose/jupyter-lab/Dockerfile       | 2 --
 docker-compose/jupyter-lab/requirements.txt | 7 +++++++
 tangostationcontrol/VERSION                 | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 83ecf135e..543027892 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,7 @@ Next change the version in the following places:
 
 # Release Notes
 
+* 0.24.5 Bugfix: install 'tango' in Jupyter Lab again
 * 0.24.4 Apply calibration values in reverse order if subband frequencies are decreasing
 * 0.24.3 Tune python logging format and parsing
 * 0.24.2 Ensure code base is PyTango 9.5 compatible
diff --git a/docker-compose/jupyter-lab/Dockerfile b/docker-compose/jupyter-lab/Dockerfile
index 74c9bfdfc..46a54f276 100644
--- a/docker-compose/jupyter-lab/Dockerfile
+++ b/docker-compose/jupyter-lab/Dockerfile
@@ -10,8 +10,6 @@ RUN --mount=type=cache,target=/var/cache/apt \
     apt-get install -y git
 
 USER ${NB_UID}
-RUN pip install lofar-station-client --index-url https://git.astron.nl/api/v4/projects/395/packages/pypi/simple
-RUN pip install tangostationcontrol --index-url https://git.astron.nl/api/v4/projects/71/packages/pypi/simple
 RUN mamba install --yes jupyterlab-git && \
         mamba clean --all -f -y && \
         fix-permissions "${CONDA_DIR}" && \
diff --git a/docker-compose/jupyter-lab/requirements.txt b/docker-compose/jupyter-lab/requirements.txt
index 871af8314..446d23996 100644
--- a/docker-compose/jupyter-lab/requirements.txt
+++ b/docker-compose/jupyter-lab/requirements.txt
@@ -5,6 +5,13 @@ 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
 
+# high-level access to station components
+lofar-station-client[tango]
+--extra-index-url https://git.astron.nl/api/v4/projects/395/packages/pypi/simple
+tangostationcontrol
+--extra-index-url https://git.astron.nl/api/v4/projects/71/packages/pypi/simple
+PyTango # should also come with lofar-station-client
+
 # low-level access to station components
 opcua
 asyncua >= 0.9.90 # LGPLv3
diff --git a/tangostationcontrol/VERSION b/tangostationcontrol/VERSION
index 4b8c9a554..7a8169a27 100644
--- a/tangostationcontrol/VERSION
+++ b/tangostationcontrol/VERSION
@@ -1 +1 @@
-0.24.4
+0.24.5
-- 
GitLab