diff options
| author | Daniel Watkins <oddbloke@ubuntu.com> | 2020-11-10 12:01:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 12:01:29 -0500 |
| commit | db2ff11dea5d884093e4e29393eeac70d3315bbb (patch) | |
| tree | 9fc2a45edf98aa950891e63d13c7efa4590b2e7a | |
| parent | 39cf5c4e1575561d622c127797ff9d87e2a649bb (diff) | |
| download | vyos-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.
| -rw-r--r-- | cloud-tests-requirements.txt | 28 | ||||
| -rw-r--r-- | integration-requirements.txt | 29 | ||||
| -rw-r--r-- | tox.ini | 4 |
3 files changed, 33 insertions, 28 deletions
diff --git a/cloud-tests-requirements.txt b/cloud-tests-requirements.txt new file mode 100644 index 00000000..b4cd18d5 --- /dev/null +++ b/cloud-tests-requirements.txt @@ -0,0 +1,28 @@ +# PyPI requirements for cloud-init cloud tests +# https://cloudinit.readthedocs.io/en/latest/topics/cloud_tests.html +# +# Note: Changes to this requirements may require updates to +# the packages/pkg-deps.json file as well. +# + +# ec2 backend +boto3==1.14.53 + +# ssh communication +paramiko==2.7.2 +cryptography==3.1 + +# lxd backend +pylxd==2.2.11 + +# finds latest image information +git+https://git.launchpad.net/simplestreams + +# azure backend +azure-storage==0.36.0 +msrestazure==0.6.1 +azure-common==1.1.23 +azure-mgmt-compute==7.0.0 +azure-mgmt-network==5.0.0 +azure-mgmt-resource==4.0.0 +azure-mgmt-storage==6.0.0 diff --git a/integration-requirements.txt b/integration-requirements.txt index 64455c79..7060841c 100644 --- a/integration-requirements.txt +++ b/integration-requirements.txt @@ -1,30 +1,5 @@ # PyPI requirements for cloud-init integration testing -# https://cloudinit.readthedocs.io/en/latest/topics/tests.html -# -# Note: Changes to this requirements may require updates to -# the packages/pkg-deps.json file as well. +# https://cloudinit.readthedocs.io/en/latest/topics/integration_tests.html # +pycloudlib @ git+https://github.com/canonical/pycloudlib.git pytest -git+https://github.com/canonical/pycloudlib.git - -# ec2 backend -boto3==1.14.53 - -# ssh communication -paramiko==2.7.2 -cryptography==3.1 - -# lxd backend -pylxd==2.2.11 - -# finds latest image information -git+https://git.launchpad.net/simplestreams - -# azure backend -azure-storage==0.36.0 -msrestazure==0.6.1 -azure-common==1.1.23 -azure-mgmt-compute==7.0.0 -azure-mgmt-network==5.0.0 -azure-mgmt-resource==4.0.0 -azure-mgmt-storage==6.0.0 @@ -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 |