From f58314bed4dc90886d13ebc85433c0e8ea2a6640 Mon Sep 17 00:00:00 2001
From: lukken <lukken@astron.nl>
Date: Wed, 5 Jan 2022 11:15:57 +0000
Subject: [PATCH] L2SS-556: Ensure tox docs job also uses base requirements
cleanly
---
docker-compose/lofar-device-base/lofar-requirements.txt | 2 +-
tangostationcontrol/setup-requirements.txt | 1 -
tangostationcontrol/tox.ini | 5 ++---
3 files changed, 3 insertions(+), 5 deletions(-)
delete mode 100644 tangostationcontrol/setup-requirements.txt
diff --git a/docker-compose/lofar-device-base/lofar-requirements.txt b/docker-compose/lofar-device-base/lofar-requirements.txt
index 95ed439cd..718c3a13a 100644
--- a/docker-compose/lofar-device-base/lofar-requirements.txt
+++ b/docker-compose/lofar-device-base/lofar-requirements.txt
@@ -1,2 +1,2 @@
# Do not put tangostationcontrol dependencies here, only setup.py / __init__.py
-GitPython >= 3.1.24 # BSD
+GitPython >= 3.1.20 # BSD
diff --git a/tangostationcontrol/setup-requirements.txt b/tangostationcontrol/setup-requirements.txt
deleted file mode 100644
index 5d5b72b81..000000000
--- a/tangostationcontrol/setup-requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-GitPython >= 3.1.20 # BSD
\ No newline at end of file
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index 5b286b102..7ac461604 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -14,9 +14,8 @@ setenv =
OS_STDERR_CAPTURE=1
OS_TEST_TIMEOUT=60
deps =
- -r{toxinidir}/setup-requirements.txt
- -r{toxinidir}/test-requirements.txt
-r{toxinidir}/../docker-compose/lofar-device-base/lofar-requirements.txt
+ -r{toxinidir}/test-requirements.txt
commands = stestr run {posargs}
[testenv:integration]
@@ -44,7 +43,7 @@ commands =
[testenv:docs]
deps =
- -r{toxinidir}/setup-requirements.txt
+ -r{toxinidir}/../docker-compose/lofar-device-base/lofar-requirements.txt
-r{toxinidir}/docs/docs-requirements.txt
commands =
sphinx-build -W -b html docs/source docs/build/html
--
GitLab