projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update exceptions
[osm/N2VC.git]
/
modules
/
libjuju
/
tox.ini
diff --git
a/modules/libjuju/tox.ini
b/modules/libjuju/tox.ini
index
e0d6a31
..
350a1fc
100644
(file)
--- a/
modules/libjuju/tox.ini
+++ b/
modules/libjuju/tox.ini
@@
-20,12
+20,15
@@
passenv =
HOME
TEST_AGENTS
deps =
HOME
TEST_AGENTS
deps =
+ asynctest
+ ipdb
+ mock
pytest
pytest-asyncio
pytest-xdist
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
[testenv:py3]
# default tox env excludes integration and serial tests
@@
-38,20
+41,17
@@
commands =
[testenv:lint]
envdir = {toxworkdir}/py3
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
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
[testenv:serial]
# tests that can't be run in parallel