X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=modules%2Flibjuju%2Ftox.ini;h=350a1fc114fe79fd5fab38ce2f4fe58cd24ddcd1;hp=e0d6a31c779d480a4b9a2387cbf2329f9afc2ddb;hb=d238b03584451451ffcea345ffc5d02c657003bd;hpb=b09436613925b2eb334c10f219b743868e4b3fe5

diff --git a/modules/libjuju/tox.ini b/modules/libjuju/tox.ini
index e0d6a31..350a1fc 100644
--- a/modules/libjuju/tox.ini
+++ b/modules/libjuju/tox.ini
@@ -20,12 +20,15 @@ passenv =
     HOME
     TEST_AGENTS
 deps =
+    asynctest
+    ipdb
+    mock
     pytest
     pytest-asyncio
     pytest-xdist
-    mock
-    asynctest
-    ipdb
+    Twine
+    # use fork to pick up fix for https://github.com/aaugustin/websockets/pull/528
+    git+https://github.com/johnsca/websockets@bug/client-redirects#egg=websockets
 
 [testenv:py3]
 # default tox env excludes integration and serial tests
@@ -38,20 +41,17 @@ commands =
 [testenv:lint]
 envdir = {toxworkdir}/py3
 commands =
-    flake8 --ignore E501 {posargs} juju tests
-deps =
-    flake8
-
-[testenv:lint]
-envdir = {toxworkdir}/py35
-commands =
-    flake8 --ignore E501 {posargs} juju
+    flake8 --ignore E501,W504 {posargs} juju tests
 deps =
     flake8
 
 [testenv:integration]
 envdir = {toxworkdir}/py3
-commands = py.test --tb native -ra -v -s -n auto -k 'integration' -m 'not serial' {posargs}
+commands =
+    # These need to be installed in a specific order
+    pip install urllib3==1.22
+    pip install pylxd
+    py.test --tb native -ra -v -s -n auto -k 'integration' -m 'not serial' {posargs}
 
 [testenv:serial]
 # tests that can't be run in parallel