summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorDaniel Watkins <oddbloke@ubuntu.com>2020-11-10 12:01:29 -0500
committerGitHub <noreply@github.com>2020-11-10 12:01:29 -0500
commitdb2ff11dea5d884093e4e29393eeac70d3315bbb (patch)
tree9fc2a45edf98aa950891e63d13c7efa4590b2e7a /tox.ini
parent39cf5c4e1575561d622c127797ff9d87e2a649bb (diff)
downloadvyos-cloud-init-db2ff11dea5d884093e4e29393eeac70d3315bbb.tar.gz
vyos-cloud-init-db2ff11dea5d884093e4e29393eeac70d3315bbb.zip
split integration and cloud_tests requirements (#652)
The cloud_tests and the integration_tests (via pycloudlib) have conflicting requirements. This commit splits up their requirements files, so we can accurately express the requirements for each.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 3 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 816e6e8e..32174dee 100644
--- a/tox.ini
+++ b/tox.ini
@@ -26,6 +26,7 @@ deps =
pylint==2.6.0
# test-requirements because unit tests are now present in cloudinit tree
-r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/cloud-tests-requirements.txt
-r{toxinidir}/integration-requirements.txt
commands = {envpython} -m pylint {posargs:cloudinit tests tools}
@@ -128,6 +129,7 @@ deps =
pylint
# test-requirements
-r{toxinidir}/test-requirements.txt
+ -r{toxinidir}/cloud-tests-requirements.txt
-r{toxinidir}/integration-requirements.txt
[testenv:citest]
@@ -135,7 +137,7 @@ basepython = python3
commands = {envpython} -m tests.cloud_tests {posargs}
passenv = HOME TRAVIS
deps =
- -r{toxinidir}/integration-requirements.txt
+ -r{toxinidir}/cloud-tests-requirements.txt
[testenv:integration-tests]
basepython = python3