Merge pull request #1 from sebleier/master

update head repo master branch

Author: vnc4f

.gitignore

@@ -19,3 +19,4 @@ MANIFEST
 .venv
 redis/
 */_build/
+build/*

.travis.yml

@@ -1,19 +1,29 @@
+dist: xenial
 language: python
 python:
   - 2.7
-  - 3.3
-  - 3.4
   - 3.5
+  - 3.6
+  - 3.7
 env:
-  - DJANGO_VERSION='>=1.8a1,<1.9'
-  - DJANGO_VERSION='>=1.9a1,<1.10'
-  - DJANGO_VERSION='>=1.10a1,<1.11'
+  - DJANGO_VERSION='<2.0'
+  - DJANGO_VERSION='>=2.0,<2.1'
+  - DJANGO_VERSION='>=2.1,<2.2'
+  - DJANGO_VERSION='==2.2b1'
 matrix:
   exclude:
-    - python: 3.3
-      env: DJANGO_VERSION='>=1.9a1,<1.10'
-    - python: 3.3
-      env: DJANGO_VERSION='>=1.10a1,<1.11'
+    - 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'
+    - python: 3.5
+      env: DJANGO_VERSION='<2.0'
+    - python: 3.6
+      env: DJANGO_VERSION='<2.0'
+    - python: 3.7
+      env: DJANGO_VERSION='<2.0'
 # command to run tests
 install: ./install_redis.sh
 script: make test DJANGO_VERSION=$DJANGO_VERSION

AUTHORS.rst

@@ -22,3 +22,4 @@
 | Martey Dodoo / martey <https://github.com/martey>
 | Joona Pääkkönen / paksu <https://github.com/paksu>
 | Tim Graham / timgraham <https://github.com/timgraham>
+| Justin Arulnathan / dinie <[email protected]>

Makefile

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

README.rst

@@ -2,8 +2,8 @@
 Redis Django Cache Backend
 ==========================
 
-.. image:: https://img.shields.io/pypi/dm/django-redis-cache.svg
-    :target: https://pypi.python.org/pypi//django-redis-cache/
+.. image:: https://pepy.tech/badge/django-redis-cache
+    :target: https://pepy.tech/project/django-redis-cache
     :alt: Downloads
 
 .. image:: https://img.shields.io/pypi/v/django-redis-cache.svg
@@ -21,6 +21,23 @@ Docs can be found at http://django-redis-cache.readthedocs.org/en/latest/.
 Changelog
 =========
 
+2.0.0
+-----
+
+* Adds support for redis-py >= 3.0.
+* Drops support for Redis 2.6.
+* Drops support for Python 3.4.
+* Removes custom ``expire`` method in lieu of Django's ``touch``.
+* Removes ``CacheKey`` in favor of string literals.
+* Adds testing for Django 2.2 and Python 3.7 (no code changes required).
+
+
+1.8.0
+-----
+
+* Confirms support for Django 1.11, 2.0, and 2.1 (no code changes required).
+* Drops support for Django < 1.11.
+
 1.7.1
 -----
 

docs/api.rst

@@ -93,6 +93,13 @@ Standard Django Cache API
     :param version: Version of key
     :type version: Integer or None
 
+.. function:: touch(self, key, timeout):
+
+    Updates the timeout on a key.
+
+    :param key: Location of the value
+    :rtype: bool
+
 
 
 Cache Methods Provided by django-redis-cache
@@ -124,14 +131,22 @@ Cache Methods Provided by django-redis-cache
     :param version: Version of the keys
 
 
-.. function:: get_or_set(self, key, func[, timeout=None]):
+.. function:: get_or_set(self, key, func[, timeout=None, lock_timeout=None, stale_cache_timeout=None]):
+
+    Get a value from the cache or call ``func`` to set it and return it.
 
-    Retrieves a key value from the cache and sets the value if it does not exist.
+    This implementation is slightly more advanced that Django's.  It provides thundering herd
+    protection, which prevents multiple threads/processes from calling the value-generating
+    function at the same time.
 
     :param key: Location of the value
     :param func: Callable used to set the value if key does not exist.
-    :param timeout: Number of seconds to hold value in cache.
+    :param timeout: Time in seconds that value at key is considered fresh.
     :type timeout: Number of seconds or None
+    :param lock_timeout: Time in seconds that the lock will stay active and prevent other threads from acquiring the lock.
+    :type lock_timeout: Number of seconds or None
+    :param stale_cache_timeout: Time in seconds that the stale cache will remain after the key has expired. If ``None`` is specified, the stale value will remain indefinitely.
+    :type stale_cache_timeout: Number of seconds or None
 
 
 .. function:: reinsert_keys(self):
@@ -147,12 +162,9 @@ Cache Methods Provided by django-redis-cache
     :param key: Location of the value
     :rtype: bool
 
+.. function:: lock(self, key, timeout=None, sleep=0.1, blocking_timeout=None, thread_local=True)
 
-.. function:: expire(self, key, timeout):
-
-    Set the expire time on a key
-
-    :param key: Location of the value
-    :rtype: bool
+    See docs for `redis-py`_.
 
 
+.. _redis-py: https://redis-py.readthedocs.io/en/latest/_modules/redis/client.html#Redis.lock

docs/intro_quick_start.rst

@@ -4,7 +4,7 @@ Intro and Quick Start
 Intro
 =====
 
-`django-redis-cache`_ is a cache backend for the `Django`_ webframework.  It
+`django-redis-cache`_ is a cache backend for the `Django`_ web framework.  It
 uses the `redis`_ server, which is a in-memory key-value data structure server.
 Similar to the great `Memcached`_ in performance, it has several features that
 makes it more appealing.
@@ -24,7 +24,7 @@ makes it more appealing.
     * Many more.
 
 Many of these features are irrelevant to caching, but can be used by other
-areas of a web stack and therefore offer a compelling case to simplify your
+areas of a web stack and therefore offers a compelling case to simplify your
 infrastructure.
 
 
@@ -35,9 +35,9 @@ Quick Start
 
 **Recommended:**
 
-* `redis`_ >= 2.4
+* `redis`_ >= 2.8
 
-* `redis-py`_ >= 2.10.3
+* `redis-py`_ >= 3.0.0
 
 * `python`_ >= 2.7
 
@@ -58,6 +58,8 @@ of redis.  Start the server by running ``./src/redis-server``
         },
     }
 
+**Warning: By default, django-redis-cache set keys in the database 1 of Redis. By default, a session with redis-cli start on database 0. Switch to database 1 with** ``SELECT 1``.
+
 .. _Django: https://www.djangoproject.com/
 .. _django-redis-cache: http://github.com/sebleier/django-redis-cache
 .. _redis-py: http://github.com/andymccurdy/redis-py/

install_redis.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-: ${REDIS_VERSION:="2.6"}
+: ${REDIS_VERSION:="4.0.11"}
 
 test -d redis || git clone https://github.com/antirez/redis
 git -C redis checkout $REDIS_VERSION