update travis with coveralls

kidig · Nov 22, 2016 · 82cc2dd · 82cc2dd
1 parent 2d6d63b
commit 82cc2dd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+source=happymailer
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,10 @@ env:
 install:
 - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
 - npm install -g mjml
-- pip install tox-travis
+- pip install tox-travis coveralls
 
-script: tox
+script:
+- tox
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+- test $TRAVIS_PYTHON_VERSION = "3.5" && coveralls
diff --git a/tox.ini b/tox.ini
@@ -2,9 +2,11 @@
 envlist = py{34,35}
 
 [testenv]
-commands = {envpython} manage.py test --no-input
+passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
 deps =
     colorlog
+commands =
+    {envpython} manage.py test --no-input
 
 [testenv:py35]
 passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
@@ -14,5 +16,4 @@ deps =
     coveralls
 commands =
     coverage run --source=happymailer manage.py test --no-input
-    coverage combine
     coveralls