From 51741c394312572ab71be5395a37d43ac2e01535 Mon Sep 17 00:00:00 2001
From: antialias <antialias@leap.se>
Date: Wed, 30 Jan 2013 16:14:17 -0500
Subject: re #1508: removed py2.7 and synced command to tests build step
 (-minus coverage).

---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tox.ini')

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


From 5ff29dc57e2877a14e705d09b7042cddf4165d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Wed, 6 Mar 2013 15:27:23 -0300
Subject: Remove everything to start from scratch

---
 tox.ini | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 tox.ini

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index e7e1015f..00000000
--- a/tox.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-[tox]
-envlist = py26
-
-[testenv]
-deps = -r{toxinidir}/pkg/requirements.pip
-       -r{toxinidir}/pkg/test-requirements.pip
-sitepackages = True
-commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad --exclude-dir=src/leap/email/
-
-[testenv:pep8]
-deps = pep8==1.1
-commands = pep8 --repeat --show-source src/leap setup.py --ignore=E202,W602 --exclude=*_rc.py --repeat
-- 
cgit v1.2.3


From c4ba840c7c0df81fa928bab2edd1f2a2e3379952 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 27 May 2013 21:42:10 +0900
Subject: adapt test suite to latest client code

* fix run_tests
* add tox.ini
* cleanup/update requirements
* fix coverage reports
* add pypi badge
---
 tox.ini | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 tox.ini

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
new file mode 100644
index 00000000..e041515d
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+envlist = py26,py27
+
+[testenv]
+deps = -r{toxinidir}/pkg/requirements.pip
+       -r{toxinidir}/pkg/requirements-testing.pip
+sitepackages = True
+commands = xvfb-run nosetests leap --first-package-wins --exclude=soledad*
+
+[testenv:pep8]
+deps = pep8==1.1
+commands = pep8 --repeat --show-source src/leap setup.py --ignore=E202,W602 --exclude=*_rc.py --repeat
-- 
cgit v1.2.3