Merge pull request sebleier#204 from felixxm/django32

Confirm support for Django 3.2.

Author: sebleier

.travis.yml

@@ -7,6 +7,7 @@ python:
 env:
   - DJANGO_VERSION='>=3.0,<3.1'
   - DJANGO_VERSION='>=3.1,<3.2'
+  - DJANGO_VERSION='>=3.2,<4.0'
 # command to run tests
 install: ./install_redis.sh
 script: make test DJANGO_VERSION=$DJANGO_VERSION

Makefile

@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 PACKAGE_NAME=redis_cache
-DJANGO_VERSION?=>=1.11,<3.2
+DJANGO_VERSION?=>=1.11,<4.0
 
 .PHONY: install_requirements
 install_requirements: requirements*.txt
@@ -21,8 +21,8 @@ clean:
 
 .PHONY: test
 test: install_requirements
-	PYTHONPATH=$(PYTHONPATH): django-admin.py test --settings=tests.settings -s
+	PYTHONPATH=$(PYTHONPATH): django-admin test --settings=tests.settings -s
 
 .PHONY: shell
 shell:
-	PYTHONPATH=$(PYTHONPATH): django-admin.py shell --settings=tests.settings
+	PYTHONPATH=$(PYTHONPATH): django-admin shell --settings=tests.settings

README.rst

@@ -21,6 +21,10 @@ Docs can be found at http://django-redis-cache.readthedocs.org/en/latest/.
 Changelog
 =========
 
+X.Y.Z
+-----
+
+* Confirms support for Django 3.2 (no code changes required).
 
 3.0.0
 -----

setup.py

@@ -23,5 +23,6 @@
         "Framework :: Django",
         "Framework :: Django :: 3.0",
         "Framework :: Django :: 3.1",
+        "Framework :: Django :: 3.2",
     ],
 )

tests/testapp/tests/base_tests.py

@@ -13,6 +13,7 @@
 except ImportError:
     import pickle
 
+import django
 from django.core.cache import caches
 from django.core.exceptions import ImproperlyConfigured
 from django.test import TestCase, override_settings
@@ -125,7 +126,12 @@ def setUp(self):
 
     def tearDown(self):
         # clear caches to allow @override_settings(CACHES=...) to work.
-        caches._caches.caches = {}
+        if django.VERSION < (3, 2):
+            caches._caches.caches = {}
+        else:
+            for alias in caches:
+                if hasattr(caches._connections, alias):
+                    del caches[alias]
         # Sometimes it will be necessary to skip this method because we need to
         # test default initialization and that may be using a different port
         # than the test redis server.

tests/testapp/tests/master_slave_tests.py

@@ -1,5 +1,6 @@
 import time
 
+import django
 from django.core.cache import caches
 from django.test import TestCase, override_settings
 
@@ -36,9 +37,11 @@ def setUp(self):
         pool.reset()
 
     def test_master_client(self):
-        # Reset the caches at the beginning of the test.
-        caches._caches.caches = {}
-
+        # Reset the cache at the beginning of the test.
+        if django.VERSION < (3, 2):
+            del caches._caches.caches['default']
+        else:
+            del caches['default']
         cache = self.get_cache()
         client = cache.master_client
         self.assertEqual(