diff --git a/docker-compose/lofar-device-base/lofar-requirements.txt b/docker-compose/lofar-device-base/lofar-requirements.txt index 95ed439cd121c0dc72b0c9a1c69d409e0bacc57e..718c3a13a58733ff12429c7b786ff2e11abb10d9 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 5d5b72b8169953f51a6d33ea783d5d70404436c2..0000000000000000000000000000000000000000 --- 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 5b286b102b9a7e6bf5327e80a79fecaee8b85121..7ac4616046e4b9aa3b6acf657e7c5a9bc2300d83 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