Skip to content

Commit

Permalink
Fix coverage combining in coveralls/codecov tox envs. Now append mode…
Browse files Browse the repository at this point in the history
… is used, to avoid discarding coverage data.
  • Loading branch information
ionelmc committed Aug 9, 2016
1 parent d6b0dc0 commit 487d9ae
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ master
<https://github.com/ionelmc/cookiecutter-pylibrary/pull/64>`_.
* Improved code style in a bunch of files. Contributed by Laurent Laporte in `#62
<https://github.com/ionelmc/cookiecutter-pylibrary/pull/62>`_.

* Fixed coverage combining in coveralls/codecov tox envs. Now append mode is used, to avoid discarding coverage data.


v1.11 (2016-01-05)
------------------
Expand Down
6 changes: 3 additions & 3 deletions {{cookiecutter.repo_name}}/ci/templates/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ deps =
skip_install = true
usedevelop = false
commands =
coverage combine
coverage combine --append
coverage report
coveralls{%- if cookiecutter.c_extension_support|lower == "yes" %} --merge=extension-coveralls.json{% endif %} []

Expand All @@ -97,7 +97,7 @@ deps =
skip_install = true
usedevelop = false
commands =
coverage combine
coverage combine --append
coverage report
coverage xml --ignore-errors
codecov []
Expand All @@ -117,7 +117,7 @@ deps = coverage
skip_install = true
usedevelop = false
commands =
coverage combine
coverage combine --append
coverage report
coverage html

Expand Down
6 changes: 3 additions & 3 deletions {{cookiecutter.repo_name}}/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ deps =
coveralls
skip_install = true
commands =
coverage combine
coverage combine --append
coverage report
coveralls{%- if cookiecutter.c_extension_support|lower == "yes" %} --merge=extension-coveralls.json{% endif %} []

Expand All @@ -132,7 +132,7 @@ deps =
codecov
skip_install = true
commands =
coverage combine
coverage combine --append
coverage report
coverage xml --ignore-errors
codecov []
Expand All @@ -149,7 +149,7 @@ commands =
deps = coverage
skip_install = true
commands =
coverage combine
coverage combine --append
coverage report
coverage html

Expand Down

0 comments on commit 487d9ae

Please sign in to comment.