Skip to content

Commit 487d9ae

Browse files
committed
Fix coverage combining in coveralls/codecov tox envs. Now append mode is used, to avoid discarding coverage data.
1 parent d6b0dc0 commit 487d9ae

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ master
2828
<https://github.com/ionelmc/cookiecutter-pylibrary/pull/64>`_.
2929
* Improved code style in a bunch of files. Contributed by Laurent Laporte in `#62
3030
<https://github.com/ionelmc/cookiecutter-pylibrary/pull/62>`_.
31-
31+
* Fixed coverage combining in coveralls/codecov tox envs. Now append mode is used, to avoid discarding coverage data.
32+
3233

3334
v1.11 (2016-01-05)
3435
------------------

{{cookiecutter.repo_name}}/ci/templates/tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ deps =
8787
skip_install = true
8888
usedevelop = false
8989
commands =
90-
coverage combine
90+
coverage combine --append
9191
coverage report
9292
coveralls{%- if cookiecutter.c_extension_support|lower == "yes" %} --merge=extension-coveralls.json{% endif %} []
9393

@@ -97,7 +97,7 @@ deps =
9797
skip_install = true
9898
usedevelop = false
9999
commands =
100-
coverage combine
100+
coverage combine --append
101101
coverage report
102102
coverage xml --ignore-errors
103103
codecov []
@@ -117,7 +117,7 @@ deps = coverage
117117
skip_install = true
118118
usedevelop = false
119119
commands =
120-
coverage combine
120+
coverage combine --append
121121
coverage report
122122
coverage html
123123

{{cookiecutter.repo_name}}/tox.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ deps =
123123
coveralls
124124
skip_install = true
125125
commands =
126-
coverage combine
126+
coverage combine --append
127127
coverage report
128128
coveralls{%- if cookiecutter.c_extension_support|lower == "yes" %} --merge=extension-coveralls.json{% endif %} []
129129

@@ -132,7 +132,7 @@ deps =
132132
codecov
133133
skip_install = true
134134
commands =
135-
coverage combine
135+
coverage combine --append
136136
coverage report
137137
coverage xml --ignore-errors
138138
codecov []
@@ -149,7 +149,7 @@ commands =
149149
deps = coverage
150150
skip_install = true
151151
commands =
152-
coverage combine
152+
coverage combine --append
153153
coverage report
154154
coverage html
155155

0 commit comments

Comments
 (0)