From eb29332bb47564f4998b574d6ec9ab751e0d3125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Thu, 22 May 2014 18:51:34 +0200
Subject: [PATCH] Change travis configuration to use the new tests system

---
 .gitignore             | 1 +
 .travis.yml            | 5 ++---
 requirements-devel.txt | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 986a2385..11a4aa6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ media
 *.pyc
 *.mo
 .venv
+.coverage
diff --git a/.travis.yml b/.travis.yml
index 79330959..93753e1a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,9 @@ addons:
 before_script:
   - psql -c 'create database taiga;' -U postgres
 install:
-  - pip install -r requirements.txt --use-mirrors
-  - pip install coveralls --use-mirrors
+  - pip install -r requirements-devel.txt --use-mirrors
 script:
-    - coverage run --source=taiga --omit='*tests*,*commands*,*migrations*,*admin*,*.jinja,*dashboard*,*settings*,*wsgi*,*questions*,*documents*' manage.py test --settings=settings.travis taiga
+    - coverage run --source=taiga --omit='*tests*,*commands*,*migrations*,*admin*,*.jinja,*dashboard*,*settings*,*wsgi*,*questions*,*documents*' -m py.test
 notifications:
   email:
     recipients:
diff --git a/requirements-devel.txt b/requirements-devel.txt
index e0162961..e858d0c9 100644
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@@ -5,3 +5,6 @@ py==1.4.20
 pytest==2.5.2
 pytest-django==2.6.1
 pytest-pythonpath==0.3
+
+coverage==3.7.1
+coveralls-0.4.2