summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini16
1 files changed, 12 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 6276662d..ef768847 100644
--- a/tox.ini
+++ b/tox.ini
@@ -21,7 +21,11 @@ setenv =
LC_ALL = en_US.utf-8
[testenv:pylint]
-deps = pylint==1.7.1
+deps =
+ # requirements
+ pylint==1.7.1
+ # test-requirements because unit tests are now present in cloudinit tree
+ -r{toxinidir}/test-requirements.txt
commands = {envpython} -m pylint {posargs:cloudinit}
[testenv:py3]
@@ -29,7 +33,7 @@ basepython = python3
deps = -r{toxinidir}/test-requirements.txt
commands = {envpython} -m nose {posargs:--with-coverage \
--cover-erase --cover-branches --cover-inclusive \
- --cover-package=cloudinit tests/unittests}
+ --cover-package=cloudinit tests/unittests cloudinit}
[testenv:py27]
basepython = python2.7
@@ -98,11 +102,15 @@ deps = pyflakes
[testenv:tip-pylint]
commands = {envpython} -m pylint {posargs:cloudinit}
-deps = pylint
+deps =
+ # requirements
+ pylint
+ # test-requirements
+ -r{toxinidir}/test-requirements.txt
[testenv:citest]
basepython = python3
commands = {envpython} -m tests.cloud_tests {posargs}
passenv = HOME
deps =
- pylxd==2.1.3
+ pylxd==2.2.4