From ead63e8c92b8dfc051da2456efb4b3d91f60bfd2 Mon Sep 17 00:00:00 2001
From: Tuomas Suutari <tuomas.suutari@anders.fi>
Date: Sun, 12 Mar 2017 01:42:30 +0200
Subject: [PATCH 1/3] Use pytest-cov for coverage collection

---
 tox.ini | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index c28baa96c..f026ac800 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,15 +6,13 @@ deps =
     piplatest: pip
     pip8: pip~=8.0
     pip9: pip~=9.0
-    coverage
     pytest
+    pytest-cov
     pyyaml
 commands =
     pip --version
-    python -m coverage run --source prequ -m pytest \
+    py.test --cov=prequ \
         --strict --doctest-modules {posargs:tests/ prequ/}
-    python -m coverage report -m
-    python -m coverage html
 
 [testenv:flake8]
 basepython = python2.7

From c921d2f4f931990443b8ba31df788736872e32fc Mon Sep 17 00:00:00 2001
From: Tuomas Suutari <tuomas.suutari@anders.fi>
Date: Sun, 12 Mar 2017 01:43:59 +0200
Subject: [PATCH 2/3] Configure coverage to use branch measurement

---
 .coveragerc | 2 ++
 tox.ini     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
new file mode 100644
index 000000000..398ff08af
--- /dev/null
+++ b/.coveragerc
@@ -0,0 +1,2 @@
+[run]
+branch = True
diff --git a/tox.ini b/tox.ini
index f026ac800..056c3bb45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ deps =
     pyyaml
 commands =
     pip --version
-    py.test --cov=prequ \
+    py.test --cov=prequ --cov-config={toxinidir}/.coveragerc \
         --strict --doctest-modules {posargs:tests/ prequ/}
 
 [testenv:flake8]

From 2ed0376f6b126b41ea75570fee0d383050e8212a Mon Sep 17 00:00:00 2001
From: Tuomas Suutari <tuomas.suutari@anders.fi>
Date: Sun, 12 Mar 2017 01:48:45 +0200
Subject: [PATCH 3/3] Remove one "no cover" pragma

IMHO "pragma: no cover" is cheating.
---
 prequ/resolver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prequ/resolver.py b/prequ/resolver.py
index 10f8663f0..9fe53a9d9 100644
--- a/prequ/resolver.py
+++ b/prequ/resolver.py
@@ -61,7 +61,7 @@ def __init__(self, constraints, repository, cache=None, prereleases=False, clear
         self.their_constraints = set()
         self.repository = repository
         if cache is None:
-            cache = DependencyCache()  # pragma: no cover
+            cache = DependencyCache()
         self.dependency_cache = cache
         self.prereleases = prereleases
         self.clear_caches = clear_caches