Merge pull request sebleier#174 from felixxm/django-3.0

Add support for Django 3.0

Author: sebleier

.travis.yml

@@ -9,17 +9,22 @@ env:
   - DJANGO_VERSION='<2.0'
   - DJANGO_VERSION='>=2.0,<2.1'
   - DJANGO_VERSION='>=2.1,<2.2'
-  - DJANGO_VERSION='==2.2b1'
+  - DJANGO_VERSION='>=2.2,<3.0'
+  - DJANGO_VERSION='>=3.0a1,<3.1'
 matrix:
   exclude:
     - python: 2.7
       env: DJANGO_VERSION='>=2.0,<2.1'
     - python: 2.7
       env: DJANGO_VERSION='>=2.1,<2.2'
     - python: 2.7
-      env: DJANGO_VERSION='==2.2b1'
+      env: DJANGO_VERSION='>=2.2,<3.0'
+    - python: 2.7
+      env: DJANGO_VERSION='>=3.0a1,<3.1'
     - python: 3.5
       env: DJANGO_VERSION='<2.0'
+    - python: 3.5
+      env: DJANGO_VERSION='>=3.0a1,<3.1'
     - python: 3.6
       env: DJANGO_VERSION='<2.0'
     - python: 3.7

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 PACKAGE_NAME=redis_cache
-DJANGO_VERSION?=>=1.11,<3.0
+DJANGO_VERSION?=>=1.11,<3.1
 
 .PHONY: install_requirements
 install_requirements: requirements*.txt

README.rst

@@ -21,6 +21,11 @@ Docs can be found at http://django-redis-cache.readthedocs.org/en/latest/.
 Changelog
 =========
 
+X.Y.Z
+-----
+
+* Adds support for Django 3.0.
+
 2.0.0
 -----
 

redis_cache/utils.py

@@ -2,9 +2,9 @@
 import warnings
 
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
-from django.utils.encoding import force_text, python_2_unicode_compatible
-from django.utils.six.moves.urllib.parse import parse_qs, urlparse
+from django.utils.encoding import force_text
+from six import python_2_unicode_compatible, string_types
+from six.moves.urllib.parse import parse_qs, urlparse
 
 from redis._compat import unicode
 from redis.connection import SSLConnection
@@ -14,7 +14,7 @@ def get_servers(location):
     """Returns a list of servers given the server argument passed in from
     Django.
     """
-    if isinstance(location, six.string_types):
+    if isinstance(location, string_types):
         servers = location.split(',')
     elif hasattr(location, '__iter__'):
         servers = location

requirements.txt

@@ -1 +1,2 @@
 redis<4.0
+six

setup.py

@@ -9,7 +9,7 @@
     license="BSD",
     packages=["redis_cache", "redis_cache.backends"],
     description="Redis Cache Backend for Django",
-    install_requires=['redis<4.0'],
+    install_requires=['redis<4.0', 'six'],
     classifiers=[
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
@@ -27,5 +27,6 @@
         "Framework :: Django :: 2.0",
         "Framework :: Django :: 2.1",
         "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
     ],
 )