diff --git a/.gitignore b/.gitignore index aa45f946f..5726575ba 100644 --- a/.gitignore +++ b/.gitignore @@ -28,14 +28,22 @@ pip-delete-this-directory.txt # Unit test / coverage reports htmlcov/ +.eggs .tox/ .coverage .cache nosetests.xml coverage.xml +coverage.c.json +coverage.filtered.info +coverage.info # Test files test_images +Tests/images/msp +Tests/images/picins +Tests/images/README.md +Tests/images/sunraster # Translations *.mo @@ -58,14 +66,16 @@ docs/_build/ # Vim cruft .*.swp -#emacs +# emacs *~ \#*# .#* -#Komodo +# Komodo *.komodoproject -#OS +# OS .DS_Store +# IDE +.idea diff --git a/.travis/after_success.sh b/.travis/after_success.sh index 1026ce3c8..43cbfba69 100755 --- a/.travis/after_success.sh +++ b/.travis/after_success.sh @@ -9,9 +9,10 @@ lcov --remove coverage.info '/usr/*' -o coverage.filtered.info gem install coveralls-lcov coveralls-lcov -v -n coverage.filtered.info > coverage.c.json -coverage report +pip install coverage pip install codecov pip install coveralls-merge +coverage report coveralls-merge coverage.c.json codecov