diff --git a/.travis.yml b/.travis.yml index e3ed5fa..d88f2b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,6 +30,10 @@ before_install: - export PATH="$HOME/bin:$PATH" install: + - pip install coveralls - pip install tox-travis script: tox + +after_success: + - coveralls diff --git a/ci/run_coveralls.py b/ci/run_coveralls.py deleted file mode 100644 index 35e719b..0000000 --- a/ci/run_coveralls.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/env/python - -"""Runs coveralls if in Travis CI build environment. Taken from -http://stackoverflow.com/a/33012308/1960601 -""" - -import os -import sys - -from subprocess import call - - -if __name__ == '__main__': - if sys.platform.lower().startswith('java'): - print("Export to coveralls skipped for Jython") - sys.exit(0) - if 'TRAVIS' in os.environ: - rc = call('coveralls') - raise SystemExit(rc) diff --git a/tox.ini b/tox.ini index d916a25..1cf242f 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ deps = py26: urllib3[secure] py: JPype1==0.6.2 jip==0.9.10 - coveralls + coverage commands = python --version python ci/jipconf_subst.py {envdir} {toxworkdir}/shared @@ -35,4 +35,3 @@ commands = driver-mock: jip install org.jaydebeapi:mockdriver:1.0-SNAPSHOT coverage run -a --source jaydebeapi test/testsuite.py {env:TESTNAME} driver-hsqldb: coverage run -a --source jaydebeapi test/doctests.py - python ci/run_coveralls.py