From f382b82b3edc327b54c3f094eb64fd7b6358ca18 Mon Sep 17 00:00:00 2001 From: Scott Torborg Date: Wed, 25 Feb 2015 23:33:16 -0800 Subject: [PATCH] Switch from nose-cover3 to nose-cov --- .travis.yml | 2 +- coverage.rc | 14 ++++++++++++++ setup.cfg | 10 +++------- tox.ini | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 coverage.rc diff --git a/.travis.yml b/.travis.yml index 640f09e..491734f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: - "npm install -g less requirejs autoprefixer" install: - - "pip install webtest mock coverage nose-cover3 flake8 --use-mirrors" + - "pip install webtest mock coverage nose-cov flake8 python-coveralls --use-mirrors" - "pip install -e . --use-mirrors" before_script: "flake8" diff --git a/coverage.rc b/coverage.rc new file mode 100644 index 0000000..230a518 --- /dev/null +++ b/coverage.rc @@ -0,0 +1,14 @@ +[run] +source = pyramid_frontend +omit = pyramid_frontend/tests/* + +[report] +# Regexes for lines to exclude from consideration +exclude_lines = + # Have to re-enable the standard pragma + pragma: nocover + +ignore_errors = True + +[html] +directory = cover diff --git a/setup.cfg b/setup.cfg index 86bedb1..a7e3297 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,8 +1,4 @@ [nosetests] -with-coverage3 = true -cover3-erase = true -cover3-package = pyramid_frontend -cover3-inclusive = true -cover3-html = true -cover3-branch = true -cover3-exclude = pyramid_frontend.tests* +with-cov = true +cov-config = coverage.rc +cov = pyramid_frontend diff --git a/tox.ini b/tox.ini index 9ce734c..8c9e141 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ deps = mock webtest coverage - nose-cover3 + nose-cov [testenv:docs] basepython = python