summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2018-06-08 10:39:12 -0600
committerChad Smith <chad.smith@canonical.com>2018-06-08 10:39:12 -0600
commitfc23ccc91307c81dd8e428465eb56efbd539267e (patch)
treed97463d6d6e453979586a425f05bc45e0d77a484
parent9a41fce0c2399f05b2c904948c969623dc04e491 (diff)
downloadvyos-cloud-init-fc23ccc91307c81dd8e428465eb56efbd539267e.tar.gz
vyos-cloud-init-fc23ccc91307c81dd8e428465eb56efbd539267e.zip
tests: remove pip install workarounds for pylxd, take upstream fix.
pylxd upstream provided a fix for the issue we were seeing, so we can take that fix now rather than having our workarounds to order pip installs. The test is that this continues to work: rm -Rf .tox/citest tox -c tox.ini --recreate --notest -e citest
-rw-r--r--integration-requirements.txt5
-rw-r--r--tox.ini9
2 files changed, 6 insertions, 8 deletions
diff --git a/integration-requirements.txt b/integration-requirements.txt
index 030c163b..e5bb5b28 100644
--- a/integration-requirements.txt
+++ b/integration-requirements.txt
@@ -11,5 +11,10 @@ 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@4b8ab1802f9aee4eb29cf7b119dae0aa47150779
+
+
# finds latest image information
bzr+lp:simplestreams
diff --git a/tox.ini b/tox.ini
index fbc2c880..2fb3209d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -134,14 +134,7 @@ deps =
[testenv:citest]
basepython = python3
-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}
+commands = {envpython} -m tests.cloud_tests {posargs}
passenv = HOME
deps =
-r{toxinidir}/integration-requirements.txt