diff --git a/docker-compose/itango/Dockerfile b/docker-compose/itango/Dockerfile index 448afacfe687f6b75b163c159a779ff14ec07ee3..b0d7038e12d8cb59cdf6d52101559a1c40238415 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 676fb6a381da4b3e6546b000f6d4465dbf387469..7b49a6cfcd2db4b786d7f5698267a672c6790a01 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 d150b6a4c4f45f7d73ed4a88d937be17aac1c616..0000000000000000000000000000000000000000 --- 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 55afa40416917fc68536f5b1cc4df2dc34a1433c..e653de75d22260675391aad490c96e4b97c0edc8 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 b4b11e6912353e2e2494a9f8631601c739f8c5cb..56b174d88e533f075a6db0710924a3f46c7ebdb5 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 a4c0c05490651f34cc0d5989c5680f80cfb9ea02..1e04149a8967d99be2aaad6f6d75f53cf656da59 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