summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-30 06:52:59 +0900
committerkali <kali@leap.se>2013-01-30 06:52:59 +0900
commit570f84756b3d1f689a172a3ff0c55abf6a60b9dd (patch)
tree0f262acacf35743664c6408edbafe6ba6f119d14 /tox.ini
parente60abdcb796ad9e2c44e9b37d3a68e7f159c035c (diff)
parent10a2303fe2d21999bce56940daecb78576f5b741 (diff)
Merge branch 'pre-release-0.2.0' into release-0.2.0
This merge contains today's state of develop branch, minus soledad and email components.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index bf4d8fb6..a9107c71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
[tox]
-envlist = py26,py27,pep8
+envlist = py26,py27
[testenv]
deps = -r{toxinidir}/pkg/requirements.pip
-r{toxinidir}/pkg/test-requirements.pip
sitepackages = True
-commands = nosetests
+commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad
[testenv:pep8]
deps = pep8==1.1