diff options
| author | Chad Smith <chad.smith@canonical.com> | 2018-06-07 13:45:09 -0600 |
|---|---|---|
| committer | Chad Smith <chad.smith@canonical.com> | 2018-06-07 13:45:09 -0600 |
| commit | 4c568f220b65dbc1af822ccfa0f31638fed02d83 (patch) | |
| tree | a6b19f352445717e5d94f1e867338382bbe2e5c8 | |
| parent | bbcc5e82e6c8e87ca483150205127cb0436c4cd9 (diff) | |
| download | vyos-cloud-init-4c568f220b65dbc1af822ccfa0f31638fed02d83.tar.gz vyos-cloud-init-4c568f220b65dbc1af822ccfa0f31638fed02d83.zip | |
tests: ordered tox dependencies for pylxd install
The pylxd project has a setup.py which defines install dependencies.
Those sub-dependendencies include pbr and requests which in turn have
package version conflicts. Since tox doesn't order dependencies installed,
serially install pinned urllib3 at 1.22 which supports both pbr deps and
requests deps of pylxd.
| -rw-r--r-- | integration-requirements.txt | 5 | ||||
| -rw-r--r-- | tox.ini | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/integration-requirements.txt b/integration-requirements.txt index df3a73ef..030c163b 100644 --- a/integration-requirements.txt +++ b/integration-requirements.txt @@ -11,10 +11,5 @@ boto3==1.5.9 # ssh communication paramiko==2.4.0 -# lxd backend -# 04/03/2018: enables use of lxd 3.0 -git+https://github.com/lxc/pylxd.git@1a85a12a23401de6e96b1aeaf59ecbff2e88f49d - - # finds latest image information bzr+lp:simplestreams @@ -134,7 +134,14 @@ deps = [testenv:citest] basepython = python3 -commands = {envpython} -m tests.cloud_tests {posargs} +commands = + # 06/07/2018: enables use of lxd 3.0 and pre-pip install urllib3==1.22 + # to avoid contextual version conflicts with pylxd's setup_requires of + # pbr which installs latest urllib3 and requests which requires < 1.23. + # Install ordered requirements as pylxd has sub-dep conflicts. + pip3 install urllib3==1.22 + pip3 install git+https://github.com/lxc/pylxd.git@1a85a12a23401de6e96b1aeaf59ecbff2e88f49d + {envpython} -m tests.cloud_tests {posargs} passenv = HOME deps = -r{toxinidir}/integration-requirements.txt |