Merge 80dade1f2a into 3fe709196a

.travis.yml

@@ -8,40 +8,40 @@ env:
   - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels
   - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
   matrix:
-  - TOXENV=flake8-py27
-  - TOXENV=flake8-py33
-  - TOXENV=py26-dj14
-  - TOXENV=py26-dj15
-  - TOXENV=py26-dj16
-  - TOXENV=pypy-dj14
-  - TOXENV=pypy-dj15
-  - TOXENV=pypy-dj16
-  - TOXENV=py27-dj14
-  - TOXENV=py27-dj15
-  - TOXENV=py27-dj16
-  - TOXENV=py27-dj17
-  - TOXENV=py27-dj18
-  - TOXENV=py27-dj19
-  - TOXENV=py32-dj15
-  - TOXENV=py32-dj16
-  - TOXENV=py32-dj17
-  - TOXENV=py32-dj18
-  - TOXENV=py32-dj19
-  - TOXENV=py33-dj15
-  - TOXENV=py33-dj16
-  - TOXENV=py33-dj17
-  - TOXENV=py33-dj18
-  - TOXENV=py33-dj19
-  - TOXENV=py34-dj15
-  - TOXENV=py34-dj16
-  - TOXENV=py34-dj17
-  - TOXENV=py34-dj18
-  - TOXENV=py34-dj19
-  - TOXENV=pypy-dj15
-  - TOXENV=pypy-dj16
-  - TOXENV=pypy-dj17
-  - TOXENV=pypy-dj18
-  - TOXENV=pypy-dj19
+    - TOXENV=flake8-py27
+    - TOXENV=flake8-py34
+    - TOXENV=py26-dj14
+    - TOXENV=py26-dj15
+    - TOXENV=py26-dj16
+    - TOXENV=pypy-dj14
+    - TOXENV=pypy-dj15
+    - TOXENV=pypy-dj16
+    - TOXENV=py27-dj14
+    - TOXENV=py27-dj15
+    - TOXENV=py27-dj16
+    - TOXENV=py27-dj17
+    - TOXENV=py27-dj18
+    - TOXENV=py27-dj19
+    - TOXENV=py32-dj15
+    - TOXENV=py32-dj16
+    - TOXENV=py32-dj17
+    - TOXENV=py32-dj18
+    - TOXENV=py32-dj19
+    - TOXENV=py33-dj15
+    - TOXENV=py33-dj16
+    - TOXENV=py33-dj17
+    - TOXENV=py33-dj18
+    - TOXENV=py33-dj19
+    - TOXENV=py34-dj15
+    - TOXENV=py34-dj16
+    - TOXENV=py34-dj17
+    - TOXENV=py34-dj18
+    - TOXENV=py34-dj19
+    - TOXENV=pypy-dj15
+    - TOXENV=pypy-dj16
+    - TOXENV=pypy-dj17
+    - TOXENV=pypy-dj18
+    - TOXENV=pypy-dj19
 install:
 - pip wheel -r tests/requirements.txt
 - pip install tox

tests/requirements.txt

@@ -4,5 +4,5 @@ mock
 dj-database-url
 dj-email-url
 dj-search-url
-django-cache-url>=0.6.0
+django-cache-url>=1.0.0
 six

tests/test_values.py

@@ -407,20 +407,26 @@ class ValueTests(TestCase):
     def test_cache_url_value(self):
         cache_setting = {
             'default': {
-                'BACKEND': 'redis_cache.cache.RedisCache',
-                'KEY_PREFIX': '',
-                'LOCATION': 'host:port:1'
+                'BACKEND': 'django_redis.cache.RedisCache',
+                'LOCATION': 'host:6379:1'
             }
         }
-        cache_url = 'redis://user@host:port/1'
+        cache_url = 'redis://user@host:6379/1'
         value = CacheURLValue(cache_url)
         self.assertEqual(value.default, cache_setting)
         value = CacheURLValue()
         self.assertEqual(value.default, {})
-        with env(CACHE_URL='redis://user@host:port/1'):
+        with env(CACHE_URL='redis://user@host:6379/1'):
             self.assertEqual(value.setup('CACHE_URL'), cache_setting)
         with env(CACHE_URL='wrong://user@host:port/1'):
-            self.assertRaises(KeyError, value.setup, 'TEST')
+            with self.assertRaises(Exception) as cm:
+                value.setup('TEST')
+            self.assertEqual(cm.exception.args[0], 'Unknown backend: "wrong"')
+        with env(CACHE_URL='redis://user@host:port/1'):
+            with self.assertRaises(ValueError) as cm:
+                value.setup('TEST')
+            self.assertEqual(cm.exception.args[0],
+                             "Cannot interpret cache URL value 'redis://user@host:port/1'")
 
     def test_search_url_value(self):
         value = SearchURLValue()

tox.ini

@@ -4,7 +4,7 @@ usedevelop = True
 minversion = 1.8
 envlist =
     flake8-py27,
-    flake8-py33,
+    flake8-py34,
     py{26,py}-dj{14,15,16},
     py27-dj{14,15,16,17,18,19},
     py{32,33,34,py}-dj{15,16,17,18,19}
@@ -34,11 +34,21 @@ commands =
     coverage run {envbindir}/django-cadmin test -v2 {posargs:tests}
     coverage report
 
+# Coverage supports only Python 3.3+ for Python 3.
+[testenv:py32-dj15]
+commands = {envbindir}/django-cadmin test -v2 {posargs:tests}
+[testenv:py32-dj16]
+commands = {envbindir}/django-cadmin test -v2 {posargs:tests}
+[testenv:py32-dj17]
+commands = {envbindir}/django-cadmin test -v2 {posargs:tests}
+[testenv:py32-dj18]
+commands = {envbindir}/django-cadmin test -v2 {posargs:tests}
+
 [testenv:flake8-py27]
 commands = flake8 configurations
 deps = flake8
 
-[testenv:flake8-py33]
+[testenv:flake8-py34]
 commands = flake8 configurations
 deps = flake8