Hopiu/django-imagekit
1
0
Fork 0
mirror of https://github.com/Hopiu/django-imagekit.git synced 2026-03-16 21:30:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release/3.2.5'

Browse source 
* release/3.2.5:
  Bump the version to 3.2.5.
  Explicitly setting serializer for celery task
This commit is contained in:
Bryan Veloso 2015-01-05 15:58:47 -08:00
commit 2bcb93da22
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
imagekit/cachefiles/backends.py
View file

@ -144,7 +144,7 @@ try:
except ImportError:
pass
else:
_celery_task = task(ignore_result=True)(_generate_file)
_celery_task = task(ignore_result=True, serializer='pickle')(_generate_file)
class Celery(BaseAsync):
@ -153,7 +153,7 @@ class Celery(BaseAsync):
"""
def __init__(self, *args, **kwargs):
try:
import celery
import celery # noqa
except ImportError:
raise ImproperlyConfigured('You must install celery to use'
' imagekit.cachefiles.backends.Celery.')
@ -185,7 +185,7 @@ class RQ(BaseAsync):
"""
def __init__(self, *args, **kwargs):
try:
import django_rq
import django_rq # noqa
except ImportError:
raise ImproperlyConfigured('You must install django-rq to use'
' imagekit.cachefiles.backends.RQ.')

2
imagekit/pkgmeta.py
View file

@ -1,5 +1,5 @@
__title__ = 'django-imagekit'
__author__ = 'Matthew Tretter, Eric Eldredge, Bryan Veloso, Greg Newman, Chris Drackett, Justin Driscoll'
__version__ = '3.2.4'
__version__ = '3.2.5'
__license__ = 'BSD'
__all__ = ['__title__', '__author__', '__version__', '__license__']