Bumps version to 3.1.0

Changelog

@@ -5,6 +5,27 @@
 .. contents::
     :local:
 
+.. _version-3.1.0:
+
+3.1.0
+=====
+:release-date: 2013-11-10 1:04 A.M BST
+
+.. note::
+
+    Please test this release in staging first and
+    make sure you read the Celery 3.1 changelog at:
+
+    http://docs.celeryproject.org/en/latest/whatsnew-3.1.html
+
+    If you upgrade from an old version then you must also
+    double check that you have 'djcelery.setup_loader()'
+    in your settings.py!
+
+- Tests passing on Django 1.6
+
+- Now works with Celery 3.1
+
 .. _version-3.0.23:
 
 3.0.23

README.rst

@@ -4,7 +4,7 @@
 
 .. image:: http://cloud.github.com/downloads/celery/celery/celery_128.png
 
-:Version: 3.0.23
+:Version: 3.1.0
 :Web: http://celeryproject.org/
 :Download: http://pypi.python.org/pypi/django-celery/
 :Source: http://github.com/celery/django-celery/

djcelery/__init__.py

@@ -5,7 +5,7 @@
 
 import os
 
-VERSION = (3, 1, 0, 'b2')
+VERSION = (3, 1, 0)
 __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
 __author__ = 'Ask Solem'
 __contact__ = '[email protected]'

djcelery/backends/cache.py

@@ -40,7 +40,7 @@ def set(self, key, value, timeout=0):
 from django.core.cache.backends.base import InvalidCacheBackendError
 try:
     from django.core.cache.backends.memcached import CacheClass
-except (ImportError, InvalidCacheBackendError):
+except (ImportError, AttributeError, InvalidCacheBackendError):
     pass
 else:
     if django.VERSION[0:2] < (1, 2) and isinstance(cache, CacheClass):

djcelery/tests/test_backends/test_cache.py

@@ -127,8 +127,11 @@ def test_memcache_wrapper(self):
             sys.stderr.write(
                 '\n* Memcache library is not installed. Skipping test.\n')
             return
-        prev_cache_cls = memcached.CacheClass
-        memcached.CacheClass = locmem.CacheClass
+        try:
+            prev_cache_cls = memcached.CacheClass
+            memcached.CacheClass = locmem.CacheClass
+        except AttributeError:
+            return
         prev_backend_module = sys.modules.pop('djcelery.backends.cache')
         try:
             from djcelery.backends.cache import cache

requirements/default.txt

@@ -1,2 +1 @@
-pytz>dev
 celery>=3.1

setup.cfg

@@ -7,5 +7,4 @@ all_files = 1
 upload-dir = docs/.build/html
 
 [bdist_rpm]
-requires = celery >= 3.0.21
-           pytz
+requires = celery >= 3.1