From c9958dee8ef23f20d99e21fb6a580c1b2c9d594a Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 6 Sep 2012 06:32:16 +0900
Subject: tox ini file

---
 tox.ini | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 tox.ini

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..cb010626
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,11 @@
+[tox]
+envlist = py26,py27,pep8
+
+[testenv]
+deps = -r{toxinidir}/pkg/requirements.pip
+       -r{toxinidir}/pkg/test-requirements.pip
+commands = nosetests
+
+[testenv:pep8]
+deps = pep8==1.1
+commands = pep8 --repeat --show-source leap setup.py
-- 
cgit v1.2.3


From c6ec834446cd6772ff900a0637c7296746f53320 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 7 Sep 2012 04:18:45 +0900
Subject: tox initial file. using global site-packages because of the unability
 to pip install PyQt4.

postmkvenv workaround for PyQt libs for manual use.

pip install breaks because they don't have a standard setup.py
installation process
---
 tox.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index cb010626..bf4d8fb6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,9 @@ envlist = py26,py27,pep8
 [testenv]
 deps = -r{toxinidir}/pkg/requirements.pip
        -r{toxinidir}/pkg/test-requirements.pip
+sitepackages = True
 commands = nosetests
 
 [testenv:pep8]
 deps = pep8==1.1
-commands = pep8 --repeat --show-source leap setup.py
+commands = pep8 --repeat --show-source src/leap setup.py --ignore=E202,W602 --exclude=*_rc.py --repeat
-- 
cgit v1.2.3


From 8a8919eb2f9efc704dbe06601c375f77526b54d3 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 25 Jan 2013 04:56:37 +0900
Subject: remove pep8 from tox run

and remove sip api setting from the qt smoke test
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tox.ini')

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
-- 
cgit v1.2.3


From 3d8e4dcbec4b879ba3760858f9c7fcd4bfcb5721 Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Fri, 25 Jan 2013 10:22:35 -0500
Subject: added xvfb-run to tox command

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index fd17f514..3566a00c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = py26,py27
 deps = -r{toxinidir}/pkg/requirements.pip
        -r{toxinidir}/pkg/test-requirements.pip
 sitepackages = True
-commands = nosetests --exclude-dir=src/leap/soledad
+commands = xfvb-run nosetests --exclude-dir=src/leap/soledad
 
 [testenv:pep8]
 deps = pep8==1.1
-- 
cgit v1.2.3


From 07240543fc2b0fe923dbad0cf2faa38dd467dd72 Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Fri, 25 Jan 2013 10:55:27 -0500
Subject: restrict tox to leap package.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 3566a00c..8bf1a8db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = py26,py27
 deps = -r{toxinidir}/pkg/requirements.pip
        -r{toxinidir}/pkg/test-requirements.pip
 sitepackages = True
-commands = xfvb-run nosetests --exclude-dir=src/leap/soledad
+commands = xfvb-run nosetests leap --exclude-dir=src/leap/soledad
 
 [testenv:pep8]
 deps = pep8==1.1
-- 
cgit v1.2.3


From 29b009617b45aafa1af0ba5afe74a6b79f8b5ae9 Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Fri, 25 Jan 2013 11:45:29 -0500
Subject: fixed typo.

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 8bf1a8db..a9107c71 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = py26,py27
 deps = -r{toxinidir}/pkg/requirements.pip
        -r{toxinidir}/pkg/test-requirements.pip
 sitepackages = True
-commands = xfvb-run nosetests leap --exclude-dir=src/leap/soledad
+commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad
 
 [testenv:pep8]
 deps = pep8==1.1
-- 
cgit v1.2.3