Revert "Separately report coverage for c extension tests and non-c extension tests."

This reverts commit 7c3cc2db5ea6b48ef19404e11452215fba8987ea.

diff --git a/.codecov.yml b/.codecov.yml
deleted file mode 100644 (file)
index 70190f7..0000000
--- a/.codecov.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-comment: false
-coverage:
-  status:
-    patch: false
-    project:
-      unit:
-        flags: noext
-      litmus:
-        flags: cext

diff --git a/.travis.yml b/.travis.yml
index 39efb96148c3b6f9ff36cf8b6d82e1a846594418..e8214ae8663772db78be24f68dc3e9fe65246486 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,14 +27,12 @@ install:
 
 script:
   # Test without c extensions
-  - python -m coverage run --source=dulwich -m unittest dulwich.tests.test_suite
-  - mv .coverage .coverage.noext
+  - python -m coverage run -p --source=dulwich -m unittest dulwich.tests.test_suite
 
   # Test with c extensions
   - python setup.py build_ext -i
-  - python -m coverage run --source=dulwich -m unittest dulwich.tests.test_suite
-  - mv .coverage .coverage.cext
+  - python -m coverage run -p --source=dulwich -m unittest dulwich.tests.test_suite
 
 after_success:
-  - codecov -F noext -f .coverage.noext
-  - codecov -F cext -f .coverage.cext
+  - python -m coverage combine
+  - codecov