From 487d9ae51cbbee6310a443c37eb4f86bbcfaa6d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
Date: Tue, 9 Aug 2016 14:02:49 +0300
Subject: [PATCH] Fix coverage combining in coveralls/codecov tox envs. Now
 append mode is used, to avoid discarding coverage data.

---
 CHANGELOG.rst                                   | 3 ++-
 {{cookiecutter.repo_name}}/ci/templates/tox.ini | 6 +++---
 {{cookiecutter.repo_name}}/tox.ini              | 6 +++---
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f241bf08..403f1408 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -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)
 ------------------
diff --git a/{{cookiecutter.repo_name}}/ci/templates/tox.ini b/{{cookiecutter.repo_name}}/ci/templates/tox.ini
index 059a2e37..a7227e83 100644
--- a/{{cookiecutter.repo_name}}/ci/templates/tox.ini
+++ b/{{cookiecutter.repo_name}}/ci/templates/tox.ini
@@ -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 %} []
 
@@ -97,7 +97,7 @@ deps =
 skip_install = true
 usedevelop = false
 commands =
-    coverage combine
+    coverage combine --append
     coverage report
     coverage xml --ignore-errors
     codecov []
@@ -117,7 +117,7 @@ deps = coverage
 skip_install = true
 usedevelop = false
 commands =
-    coverage combine
+    coverage combine --append
     coverage report
     coverage html
 
diff --git a/{{cookiecutter.repo_name}}/tox.ini b/{{cookiecutter.repo_name}}/tox.ini
index fa918299..e6008d10 100644
--- a/{{cookiecutter.repo_name}}/tox.ini
+++ b/{{cookiecutter.repo_name}}/tox.ini
@@ -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 %} []
 
@@ -132,7 +132,7 @@ deps =
     codecov
 skip_install = true
 commands =
-    coverage combine
+    coverage combine --append
     coverage report
     coverage xml --ignore-errors
     codecov []
@@ -149,7 +149,7 @@ commands =
 deps = coverage
 skip_install = true
 commands =
-    coverage combine
+    coverage combine --append
     coverage report
     coverage html