From 2afd88eb5842747b53b531ff86ea4c75797b7d9d Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Sat, 25 Mar 2023 11:25:12 +0000
Subject: [PATCH] Remove unused lofar-requirements.txt
---
docker-compose/itango/Dockerfile | 4 ----
docker-compose/lofar-device-base/Dockerfile | 4 +---
docker-compose/lofar-device-base/lofar-requirements.txt | 2 --
tangostationcontrol/tangostationcontrol/beam/hba_tile.py | 1 +
tangostationcontrol/tangostationcontrol/test/README.md | 3 +--
tangostationcontrol/tox.ini | 2 --
6 files changed, 3 insertions(+), 13 deletions(-)
delete mode 100644 docker-compose/lofar-device-base/lofar-requirements.txt
diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile
index 448afacfe..b0d7038e1 100644
--- a/docker-compose/itango/Dockerfile
+++ b/docker-compose/itango/Dockerfile
@@ -8,7 +8,3 @@ RUN sudo apt-get -y update && \
sudo apt-get -y install telnet tmux traceroute vim xterm git && \
sudo aptitude clean && \
sudo aptitude autoclean
-
-COPY lofar-requirements.txt /lofar-requirements.txt
-RUN sudo pip3 install -r /lofar-requirements.txt && \
- sudo pip3 cache purge
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index 676fb6a38..7b49a6cfc 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -9,14 +9,12 @@ RUN sudo apt-get install -y python3-dev libboost-python-dev pkg-config && sudo a
RUN sudo apt-get install -y rsync && sudo apt-get clean
RUN sudo apt-get install -y netcat && sudo apt-get clean
-COPY lofar-device-base/lofar-requirements.txt /lofar-requirements.txt
-
# Manually install all requirements from the .txt as part of the base image
# This reduces runtime overhead as well as preventing issues around dependency
# installation for development builds (pip install ./ ignores requirements.txt)
COPY tmp/requirements.txt /tangostationcontrol-requirements.txt
-RUN sudo pip3 install -r /tangostationcontrol-requirements.txt -r /lofar-requirements.txt
+RUN sudo pip3 install -r /tangostationcontrol-requirements.txt
# install and use ephimerides and geodetic ("measures") tables for casacore.
# we install a _stub_ since the tables need to be deployed explicitly from within the software.
diff --git a/docker-compose/lofar-device-base/lofar-requirements.txt b/docker-compose/lofar-device-base/lofar-requirements.txt
deleted file mode 100644
index d150b6a4c..000000000
--- a/docker-compose/lofar-device-base/lofar-requirements.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not put tangostationcontrol dependencies here, only setup.py / __init__.py
-
diff --git a/tangostationcontrol/tangostationcontrol/beam/hba_tile.py b/tangostationcontrol/tangostationcontrol/beam/hba_tile.py
index 55afa4041..e653de75d 100644
--- a/tangostationcontrol/tangostationcontrol/beam/hba_tile.py
+++ b/tangostationcontrol/tangostationcontrol/beam/hba_tile.py
@@ -34,6 +34,7 @@ class HBATAntennaOffsets(object):
https://git.astron.nl/RD/lofar-referentie-vlak/-/blob/master/data/dts/dts.ipynb
https://git.astron.nl/ro/lofar/-/blob/master/MAC/Deployment/data/Coordinates/calc_hba_deltas.py
https://github.com/brentjens/lofar-antenna-positions/blob/master/lofarantpos/db.py#L208
+
"""
""" Model of the HBAT1 tile, as offsets of each antenna with respect to the reference center, in metres. """
diff --git a/tangostationcontrol/tangostationcontrol/test/README.md b/tangostationcontrol/tangostationcontrol/test/README.md
index b4b11e691..56b174d88 100644
--- a/tangostationcontrol/tangostationcontrol/test/README.md
+++ b/tangostationcontrol/tangostationcontrol/test/README.md
@@ -31,8 +31,7 @@ after the task finishes preventing the excessive downloading and installation
of dependencies.
The Tox environments in this project are configured to install any dependencies
-listed in [test-requirements.txt](../test-requirements.txt) and
-[lofar-requirements.txt](../../docker-compose/lofar-device-base/lofar-requirements.txt)
+listed in [test-requirements.txt](../test-requirements.txt),
this can also easily be verified within our [configuration file](../tox.ini).
## Testing approach
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index a4c0c0549..1e04149a8 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -19,7 +19,6 @@ setenv =
envdir = {toxworkdir}/testenv
deps =
-r{toxinidir}/requirements.txt
- -r{toxinidir}/../docker-compose/lofar-device-base/lofar-requirements.txt
-r{toxinidir}/test-requirements.txt
commands_pre =
{envpython} --version
@@ -105,7 +104,6 @@ commands = {envpython} -m build
[testenv:docs]
envdir = {toxworkdir}/docs
deps =
- -r{toxinidir}/../docker-compose/lofar-device-base/lofar-requirements.txt
-r{toxinidir}/docs/docs-requirements.txt
commands =
sphinx-build --version
--
GitLab