Skip to content

Commit 96a3568

Browse files
committed
Add support for testing against the builtin redis backend
1 parent 0a62691 commit 96a3568

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

cachalot/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
'django.core.cache.backends.dummy.DummyCache',
3131
'django.core.cache.backends.locmem.LocMemCache',
3232
'django.core.cache.backends.filebased.FileBasedCache',
33+
'django.core.cache.backends.redis.RedisCache',
3334
'django_redis.cache.RedisCache',
3435
'django.core.cache.backends.memcached.MemcachedCache',
3536
'django.core.cache.backends.memcached.PyLibMCCache',

docs/quickstart.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Requirements
99
- a cache configured as ``'default'`` with one of these backends:
1010

1111
- `django-redis <https://github.com/niwinz/django-redis>`_
12+
- `redis <https://docs.djangoproject.com/en/dev/topics/cache/#redis>`_
13+
(requires Django >= 4)
1214
- `memcached <https://docs.djangoproject.com/en/dev/topics/cache/#memcached>`_
1315
(using either python-memcached or pylibmc)
1416
- `filebased <https://docs.djangoproject.com/en/dev/topics/cache/#filesystem-caching>`_

settings.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
'PICKLE_VERSION': 2,
4747
},
4848
},
49+
'builtin_redis': {
50+
'BACKEND': 'django.core.cache.backends.redis.RedisCache',
51+
# make sure to use a different redis database to avoid conflicts between cache backends
52+
'LOCATION': 'redis://127.0.0.1:6379/1',
53+
},
4954
'memcached': {
5055
'BACKEND': 'django.core.cache.backends.memcached.'
5156
+ ('PyMemcacheCache' if __DJ_V[0] > 2

tox.ini

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[tox]
22
envlist =
33
py{37,38,39,310}-django3.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
4-
py{38,39,310}-django4.1-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
5-
py{38,39,310,312}-django4.2-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
6-
py{310,311,312}-django5.0-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
7-
py{310,311,312}-djangomain-{sqlite3,postgresql,mysql}-{redis,memcached,pylibmc,locmem,filebased},
4+
py{38,39,310}-django4.1-{sqlite3,postgresql,mysql}-{builtin_redis,redis,memcached,pylibmc,locmem,filebased},
5+
py{38,39,310,312}-django4.2-{sqlite3,postgresql,mysql}-{builtin_redis,redis,memcached,pylibmc,locmem,filebased},
6+
py{310,311,312}-django5.0-{sqlite3,postgresql,mysql}-{builtin_redis,redis,memcached,pylibmc,locmem,filebased},
7+
py{310,311,312}-djangomain-{sqlite3,postgresql,mysql}-{builtin_redis,redis,memcached,pylibmc,locmem,filebased},
88

99
[testenv]
1010
passenv = *
@@ -35,14 +35,15 @@ deps =
3535
beautifulsoup4
3636
coverage
3737
setenv =
38-
sqlite3: DB_ENGINE=sqlite3
39-
postgresql: DB_ENGINE=postgresql
40-
mysql: DB_ENGINE=mysql
41-
locmem: CACHE_BACKEND=locmem
42-
filebased: CACHE_BACKEND=filebased
43-
redis: CACHE_BACKEND=redis
44-
memcached: CACHE_BACKEND=memcached
45-
pylibmc: CACHE_BACKEND=pylibmc
38+
sqlite3: DB_ENGINE=sqlite3
39+
postgresql: DB_ENGINE=postgresql
40+
mysql: DB_ENGINE=mysql
41+
locmem: CACHE_BACKEND=locmem
42+
filebased: CACHE_BACKEND=filebased
43+
redis: CACHE_BACKEND=redis
44+
builtin_redis: CACHE_BACKEND=builtin_redis
45+
memcached: CACHE_BACKEND=memcached
46+
pylibmc: CACHE_BACKEND=pylibmc
4647
commands =
4748
coverage run -a --source=cachalot ./runtests.py
4849

0 commit comments

Comments
 (0)