Merge fcd796b into 8aa2e80

.travis.yml

@@ -6,6 +6,7 @@ services:
 
 notifications:
   email: false
+  webhooks: https://coveralls.io/webhook
 
 branches:  # blacklist
   except:
@@ -16,6 +17,10 @@ cache:
   directories:
     - $HOME/dl_cache
 
+env:
+  global:
+    - COVERALLS_PARALLEL=true
+
 matrix:
   fast_finish: true
   allow_failures:

ci/travis_script.sh

@@ -3,10 +3,17 @@ set -x
 set -e
 
 pip3 install --upgrade git+https://github.com/fmaussion/salem.git
-pip3 install coveralls
+pip3 install --upgrade coveralls coverage pytest-cov
+
+[[ -n "$DO_COVERALLS" ]] && COV_OPTS="--cov-config .coveragerc --cov=oggm --cov-report term-missing --cov-append" || COV_OPTS=""
 
 cd /root/oggm
 pip3 install -e .
-pytest oggm --mpl-upload $MPL --cov-config .coveragerc --cov=oggm --cov-report term-missing --run-slow --run-test-env $OGGM_TEST_ENV
-coverage combine || true
-coveralls || true
+
+[[ -n "$DO_COVERALLS" ]] && coverage erase
+
+pytest --mpl-upload $MPL $COV_OPTS --run-slow --run-test-env $OGGM_TEST_ENV oggm
+
+if [[ -n "$DO_COVERALLS" ]]; then
+	coveralls || true
+fi

ci/travis_stage_script.sh

@@ -12,8 +12,9 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
 
     mkdir -p $HOME/dl_cache
     export OGGM_DOWNLOAD_CACHE=/dl_cache
+    [[ ! -z "${TEST_CONTAINER##*[!0-9]*}" ]] && export DO_COVERALLS=1 || unset DO_COVERALLS
 
-    docker create --name oggm_travis -ti -v $HOME/dl_cache:/dl_cache -e OGGM_DOWNLOAD_CACHE -e OGGM_TEST_ENV -e OGGM_TEST_MULTIPROC -e MPL -e CI -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST oggm/untested_base:$IMAGE_TAG /bin/bash /root/oggm/ci/travis_script.sh
+    docker create --name oggm_travis -ti -v $HOME/dl_cache:/dl_cache -e DO_COVERALLS -e OGGM_DOWNLOAD_CACHE -e OGGM_TEST_ENV -e OGGM_TEST_MULTIPROC -e MPL -e CI -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BRANCH -e TRAVIS_PULL_REQUEST oggm/untested_base:$IMAGE_TAG /bin/bash /root/oggm/ci/travis_script.sh
     docker cp $PWD oggm_travis:/root/oggm
 
     docker start -ai oggm_travis