Merge pull request #315 from zpencerq/master

Add testing for Django 1.2, 1.3 and 1.4 with some fixes.

Author: ask

djcelery/picklefield.py

@@ -14,8 +14,6 @@
 """
 from __future__ import absolute_import, unicode_literals
 
-import django
-
 from base64 import b64encode, b64decode
 from zlib import compress, decompress
 
@@ -35,12 +33,12 @@
 NO_DECOMPRESS_HEADER = b'\x1e\x00r8d9qwwerwhA@'
 
 
-if django.VERSION < (1, 3):
-    BaseField = models.Field
-else:
-    @with_metaclass(models.SubfieldBase)
-    class BaseField(models.Field):
-        pass
+@with_metaclass(models.SubfieldBase, skip_attrs=set([
+    'db_type',
+    'get_db_prep_save'
+    ]))
+class BaseField(models.Field):
+    pass
 
 
 class PickledObject(str):

djcelery/tests/test_backends/test_cache.py

@@ -5,6 +5,7 @@
 from datetime import timedelta
 
 from billiard.einfo import ExceptionInfo
+import django
 from django.core.cache.backends.base import InvalidCacheBackendError
 
 from celery import result
@@ -103,8 +104,13 @@ def test_custom_cache_backend(self):
         from celery import current_app
         prev_backend = current_app.conf.CELERY_CACHE_BACKEND
         prev_module = sys.modules['djcelery.backends.cache']
-        current_app.conf.CELERY_CACHE_BACKEND = \
-            'django.core.cache.backends.dummy.DummyCache'
+
+        if django.VERSION >= (1, 3):
+            current_app.conf.CELERY_CACHE_BACKEND = \
+                'django.core.cache.backends.dummy.DummyCache'
+        else:
+            # Django 1.2 used 'scheme://' style cache backends
+            current_app.conf.CELERY_CACHE_BACKEND = 'dummy://'
         sys.modules.pop('djcelery.backends.cache')
         try:
             from djcelery.backends.cache import cache

requirements/test.txt

@@ -3,6 +3,5 @@ coverage>=3.0
 nose
 nose-cover3
 mock
-django
 django-nose
 python-memcached

tests/urls.py

@@ -1,5 +1,9 @@
-from django.conf.urls import (patterns, url, include,  # noqa
-                              handler500, handler404)
+try:
+    from django.conf.urls import (patterns, include, url,
+                                  handler500, handler404)
+except ImportError:
+    from django.conf.urls.defaults import (patterns, include, url,  # noqa
+                                  handler500, handler404)
 from djcelery.views import apply
 
 # Uncomment the next two lines to enable the admin:

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py25,py26,py27,py27-1.4.X
+envlist = py26,py27,py27-1.4.X,py27-1.3.X,py27-1.2.X
 
 [testenv]
 distribute = True
@@ -9,30 +9,43 @@ sitepackages = False
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
+       django
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            env TOXINIDIR="{toxinidir}" python setup.py citest
 
 [testenv:py26]
 basepython = python2.6
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
+       django
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            env TOXINIDIR="{toxinidir}" python setup.py citest
 
-[testenv:py25]
-basepython = python2.5
+[testenv:py27-1.4.X]
+basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
+       https://github.com/celery/kombu/zipball/master
+       https://github.com/celery/celery/zipball/master
+       django>=1.4,<1.5
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            env TOXINIDIR="{toxinidir}" python setup.py citest
 
+[testenv:py27-1.3.X]
+basepython = python2.7
+deps = -r{toxinidir}/requirements/default.txt
+       -r{toxinidir}/requirements/test.txt
+       https://github.com/celery/kombu/zipball/master
+       django>=1.3,<1.4
+commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
+           env TOXINIDIR="{toxinidir}" python setup.py citest
 
-[testenv:py27-1.4.X]
+[testenv:py27-1.2.X]
 basepython = python2.7
 deps = -r{toxinidir}/requirements/default.txt
        -r{toxinidir}/requirements/test.txt
        https://github.com/celery/kombu/zipball/master
-       https://github.com/celery/celery/zipball/master
-       https://github.com/django/django/zipball/master
+       django>=1.2,<1.3
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            env TOXINIDIR="{toxinidir}" python setup.py citest
+           rm {toxinidir}/tests/test_djcelery-test-db