From 6f163727dc61c4f83aac72b48d21bf459af50bbd Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Sep 2017 12:21:12 +0200
Subject: [PATCH 1/5] tests: fix test_cache_url_value for new django-cache-url

---
 tests/test_values.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_values.py b/tests/test_values.py
index 0f12634..51dc188 100644
--- a/tests/test_values.py
+++ b/tests/test_values.py
@@ -419,7 +419,7 @@ class ValueTests(TestCase):
         cache_setting = {
             'default': {
                 'BACKEND': 'django_redis.cache.RedisCache',
-                'LOCATION': 'host:6379:1'
+                'LOCATION': 'redis://host:6379/1',
             }
         }
         cache_url = 'redis://user@host:6379/1'

From 6360a34c555fe08db467a2bf6ea69d8efa28bb59 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Sep 2017 12:32:41 +0200
Subject: [PATCH 2/5] Fix Travis for py33 and pypy

Python 3.3 reached EOL today, so remove it (works around
test_multiprocessing failing there
(https://travis-ci.org/jazzband/django-configurations/jobs/281237282)).
---
 .travis.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6833944..c75f269 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,21 +9,23 @@ env:
   - TOXENV=py27-dj18
   - TOXENV=py27-dj19
   - TOXENV=py27-djmaster
-  - TOXENV=py33-dj18
   - TOXENV=py34-dj18
   - TOXENV=py34-dj19
   - TOXENV=py34-djmaster
   - TOXENV=py35-dj18
   - TOXENV=py35-dj19
   - TOXENV=py35-djmaster
-  - TOXENV=pypy-dj18
-  - TOXENV=pypy-dj19
 matrix:
   allow_failures:
     - env: TOXENV=py27-djmaster
     - env: TOXENV=py34-djmaster
     - env: TOXENV=py35-djmaster
     - env: TOXENV=pypy-djmaster
+  include:
+    - env: TOXENV=pypy-dj18
+      python: pypy
+    - env: TOXENV=pypy-dj19
+      python: pypy
 install:
   - pip install tox codecov
 script: tox -v

From abfc8a7002f403eba59a96151131b2b32ff84d33 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Sep 2017 11:59:40 +0200
Subject: [PATCH 3/5] .coveragerc: include tests

---
 .coveragerc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 0227795..046fca2 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,3 @@
 [run]
-source = configurations
+source = configurations,tests
 branch = 1
-
-[report]
-omit = *tests*,*migrations*

From ece5a35790ed2ebd75851c6ccee40e9e29f0a4ca Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Sep 2017 12:01:13 +0200
Subject: [PATCH 4/5] Travis: report coverage, install codecov only
 after_success

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

diff --git a/.travis.yml b/.travis.yml
index c75f269..81fcaec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,10 +27,12 @@ matrix:
     - env: TOXENV=pypy-dj19
       python: pypy
 install:
-  - pip install tox codecov
+  - pip install tox
 script: tox -v
 after_success:
+  - pip install codecov
   - codecov
+  - coverage report -m
 branches:
   except: templates/1.5.x templates/1.6.x
 deploy:

From a7dfb7dfcf5428dbe7c5deb2dcef3c5bc247b30b Mon Sep 17 00:00:00 2001
From: Daniel Hahler <git@thequod.de>
Date: Fri, 29 Sep 2017 12:34:07 +0200
Subject: [PATCH 5/5] codecov: use flags based on TOXENV

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 81fcaec..ac142f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ install:
 script: tox -v
 after_success:
   - pip install codecov
-  - codecov
+  - codecov --required -X gcov --flags ${TOXENV//-/ }
   - coverage report -m
 branches:
   except: templates/1.5.x templates/1.6.x