Merge branch 'fix-missing-tango-in-jupyter' into 'master'

Fix missing tango in Jupyter notebooks

See merge request !782

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

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}" && \

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

tangostationcontrol/VERSION

-0.24.4
+0.24.5