summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-25 04:56:37 +0900
committerkali <kali@leap.se>2013-01-25 04:56:37 +0900
commit8a8919eb2f9efc704dbe06601c375f77526b54d3 (patch)
tree3cd6001ee9a0ed7d63dabc5b7de5d8e49ccdf96b
parent6df7be5ed8c8fbe994182bd01b592b12666f93c7 (diff)
remove pep8 from tox run
and remove sip api setting from the qt smoke test
-rw-r--r--tests/test_qt_environment.py2
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/test_qt_environment.py b/tests/test_qt_environment.py
index d97322b9..e90d527f 100644
--- a/tests/test_qt_environment.py
+++ b/tests/test_qt_environment.py
@@ -2,7 +2,7 @@ import sys
import unittest
import sip
-sip.setapi('QVariant', 2)
+#sip.setapi('QVariant', 2)
from PyQt4 import QtGui
diff --git a/tox.ini b/tox.ini
index bf4d8fb6..fd17f514 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 = nosetests --exclude-dir=src/leap/soledad
[testenv:pep8]
deps = pep8==1.1