Finish integration with travis + tox + coveralls

angvp · Nov 3, 2015 · 2a4b332 · 2a4b332
1 parent 1a44e42
commit 2a4b332
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,10 +11,12 @@ env:
     - TOX_ENV=py34-django1.8
 
 install:
-  - pip install tox
+  - pip install tox coverage coveralls
 
 script:
+  - coverage erase
   - tox -e $TOX_ENV
 
 after_success:
-  - tox -e stats
+  - coverage combine
+  - coveralls
diff --git a/tox.ini b/tox.ini
@@ -1,10 +1,10 @@
 [tox]
 downloadcache = {toxworkdir}/_download/
-envlist = {py27,py34}-django{1.8,1.7},py27-django{1.6,1.5},stats
+envlist = {py27,py34}-django{1.8,1.7},py27-django{1.6,1.5}
 
 [testenv]
 commands = 
-    python runtests.py --fast --create-db 
+    coverage run runtests.py --fast --create-db 
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps = 
@@ -13,11 +13,3 @@ deps =
     django1.7: Django<1.8
     django1.6: Django<1.7
     django1.5: Django<1.6
-
-[testenv:stats]
-commands=
-    coverage run --source changuito runtests.py --fast --create-db
-    coveralls
-deps =
-    -r{toxinidir}/requirements-test.txt
-    Django<1.9