Simplify test/coverage commands. Fix coveralls to only send out celer…

…y's coverage.
asweigart · Feb 2, 2014 · 46c5846 · 46c5846
1 parent 51beb51
commit 46c5846
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -1,3 +1,6 @@
 [run]
-parallel = 1
+branch = 1
+cover_pylib = 0
 omit = celery.utils.debug,celery.tests.*,celery.bin.graph
+[report]
+omit = */python?.?/*,*/site-packages/*
diff --git a/setup.cfg b/setup.cfg
@@ -1,9 +1,5 @@
 [nosetests]
 where = celery/tests
-cover3-branch = 1
-cover3-html = 1
-cover3-package = celery
-cover3-exclude = celery.utils.debug,celery.tests.*,celery.bin.graph
 
 [build_sphinx]
 source-dir = docs/

diff --git a/tox.ini b/tox.ini
@@ -16,51 +16,36 @@ deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install anyjson
-           nosetests celery.tests --with-coverage []
-           coverage combine
-           coverage report
+           nosetests celery.tests --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:3.2]
 basepython = python3.2
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test3.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install anyjson
-           nosetests celery.tests --with-coverage []
-           coverage combine
-           coverage report
+           nosetests celery.tests --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:2.7]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install anyjson
-           nosetests --with-coverage []
-           coverage combine
-           coverage report
+           nosetests --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:2.6]
 basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install anyjson
-           nosetests --with-coverage []
-           coverage combine
-           coverage report
+           nosetests --with-coverage --cover-inclusive --cover-erase []
 
 [testenv:pypy]
 basepython = pypy
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        -r{toxinidir}/requirements/test-ci.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
-           pip install anyjson
-           nosetests --with-coverage []
-           coverage combine
-           coverage report
+           nosetests --with-coverage --cover-inclusive --cover-erase []