Trying to global coverage

django-inplaceedit · Oct 9, 2013 · 200d58b · 200d58b
1 parent 8ec8246
commit 200d58b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,14 @@
 language: python
 
 install:
-  - pip install -q --use-mirrors tox python-coveralls
+  - pip install -q --use-mirrors tox==1.6.1 python-coveralls==2.0.4 coveralls==0.3
 
 script:
   - tox
+before_success:
+  - coverage erase
 after_success:
+  - coverage combine
   - coveralls
 
 notifications:

diff --git a/tox.ini b/tox.ini
@@ -4,8 +4,8 @@ envlist = py27-dj15,py27-dj14,py27-dj13,py27-dj12,py33-dj15,py26-dj15,py26-dj14,
 [testenv]
 usedevelop = True
 commands =
-    python {envbindir}/coverage run testing/run_tests.py
-    python {envbindir}/coverage run testing/run_tests.py testing.settings_no_debug
+    python {envbindir}/coverage run -p testing/run_tests.py
+    python {envbindir}/coverage run -p testing/run_tests.py testing.settings_no_debug
 install_command =
     pip install {opts} {packages}