From cb257ec524f82ddc8ca8e6419964737569d4df3c Mon Sep 17 00:00:00 2001
From: Trey Hunner <trey@treyhunner.com>
Date: Wed, 29 Jul 2015 20:45:23 -0700
Subject: [PATCH 1/5] Measure code coverage in tox

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index d941b6d78..8348f8148 100644
--- a/tox.ini
+++ b/tox.ini
@@ -9,7 +9,7 @@ envlist =
        {py27,py32,py33,py34}-django{17,18,master}
 
 [testenv]
-commands = ./runtests.py --fast {posargs}
+commands = ./runtests.py --fast {posargs} --coverage
 setenv =
        PYTHONDONTWRITEBYTECODE=1
 deps =

From 5b955363765970d7ba7f241fb4599492ad5bfce2 Mon Sep 17 00:00:00 2001
From: Trey Hunner <trey@treyhunner.com>
Date: Wed, 29 Jul 2015 20:53:57 -0700
Subject: [PATCH 2/5] Run codecov after success on Travis CI

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 50dc368e4..7ba76b50f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,3 +43,7 @@ install:
 
 script:
     - tox -e $TOX_ENV
+
+after_success:
+    - pip install codecov
+    - codecov

From 48b21b6063fec77fc938f9ee7eb41f0d147dc1d1 Mon Sep 17 00:00:00 2001
From: Trey Hunner <trey@treyhunner.com>
Date: Fri, 31 Jul 2015 18:28:49 -0700
Subject: [PATCH 3/5] Always measure branch coverage

---
 .coveragerc | 2 ++
 1 file changed, 2 insertions(+)
 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

From 4cb14d82406c30e2080b3a5ce1e88f54a5d8a632 Mon Sep 17 00:00:00 2001
From: Trey Hunner <trey@treyhunner.com>
Date: Mon, 3 Aug 2015 08:39:24 -0700
Subject: [PATCH 4/5] Don't measure branch coverage

---
 .coveragerc | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 .coveragerc

diff --git a/.coveragerc b/.coveragerc
deleted file mode 100644
index 398ff08af..000000000
--- a/.coveragerc
+++ /dev/null
@@ -1,2 +0,0 @@
-[run]
-branch = True

From 34c74b8925ed0e012c524d0e569f7b93d634928a Mon Sep 17 00:00:00 2001
From: Trey Hunner <trey@treyhunner.com>
Date: Mon, 3 Aug 2015 08:57:18 -0700
Subject: [PATCH 5/5] Add coverage badge

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index af8ac58e4..78e69ee6c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # [Django REST framework][docs]
 
 [![build-status-image]][travis]
+[![coverage-status-image]][codecov]
 [![pypi-version]][pypi]
 
 **Awesome web-browsable Web APIs.**
@@ -159,6 +160,8 @@ Send a description of the issue via email to [rest-framework-security@googlegrou
 
 [build-status-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.svg?branch=master
 [travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
+[coverage-status-image]: http://codecov.io/github/tomchristie/django-rest-framework/coverage.svg?branch=master
+[codecov]: http://codecov.io/github/tomchristie/django-rest-framework?branch=master
 [pypi-version]: https://img.shields.io/pypi/v/djangorestframework.svg
 [pypi]: https://pypi.python.org/pypi/djangorestframework
 [twitter]: https://twitter.com/_tomchristie