Merge branch 'release/0.8'

Author: stefanw

.travis.yml

@@ -2,20 +2,50 @@ language: python
 python:
   - "2.6"
   - "2.7"
+  - "3.3"
+  - "3.4"
 before_install:
   - export DJANGO_SETTINGS_MODULE=celery_haystack.test_settings
 install:
   - pip install -e .
-  - pip install -r requirements/$HAYSTACK.txt Django==$DJANGO
+  - pip install -r requirements/$HAYSTACK.txt $DJANGO
 before_script:
   - flake8 celery_haystack --ignore=E501
 script:
   - coverage run --branch --source=celery_haystack `which django-admin.py` test celery_haystack
   - coverage report --omit=celery_haystack/test*
 env:
-  - DJANGO=1.3.7 HAYSTACK=v1
-  - DJANGO=1.3.7 HAYSTACK=v2
-  - DJANGO=1.4.5 HAYSTACK=v1
-  - DJANGO=1.4.5 HAYSTACK=v2
-  - DJANGO=1.5 HAYSTACK=v1
-  - DJANGO=1.5 HAYSTACK=v2
+  - DJANGO="Django==1.4.13" HAYSTACK=v1
+  - DJANGO="Django==1.4.13" HAYSTACK=v2
+  - DJANGO="Django==1.5.8" HAYSTACK=v1
+  - DJANGO="Django==1.5.8" HAYSTACK=v2
+  - DJANGO="Django==1.6.5" HAYSTACK=v1
+  - DJANGO="Django==1.6.5" HAYSTACK=v2
+  - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v1
+  - DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v2
+matrix:
+  exclude:
+  - env: DJANGO="Django==1.4.13" HAYSTACK=v1
+    python: "3.3"
+  - env: DJANGO="Django==1.4.13" HAYSTACK=v2
+    python: "3.3"
+  - env: DJANGO="Django==1.5.8" HAYSTACK=v1
+    python: "3.3"
+  - env: DJANGO="Django==1.6.5" HAYSTACK=v1
+    python: "3.3"
+  - env: DJANGO="Django==1.4.13" HAYSTACK=v1
+    python: "3.4"
+  - env: DJANGO="Django==1.4.13" HAYSTACK=v2
+    python: "3.4"
+  - env: DJANGO="Django==1.5.8" HAYSTACK=v1
+    python: "3.4"
+  - env: DJANGO="Django==1.6.5" HAYSTACK=v1
+    python: "3.4"
+  - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v1
+    python: "2.6"
+  - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v2
+    python: "2.6"
+  - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v1
+    python: "3.3"
+  - env: DJANGO="https://www.djangoproject.com/download/1.7c2/tarball/" HAYSTACK=v1
+    python: "3.4"

README.rst

@@ -12,13 +12,14 @@ deleting objects in a Haystack_ search index.
 Requirements
 ------------
 
-* Django 1.2+
+* Django 1.4+
 * Haystack_ `1.2.X`_ *or* `2.X`_
-* Celery_ 2.X
+* Celery_ 3.X
 
 You also need to install your choice of one of the supported search engines
 for Haystack and one of the supported backends for Celery.
 
+
 .. _Haystack: http://haystacksearch.org
 .. _`1.2.X`: http://pypi.python.org/pypi/django-haystack/1.2.5
 .. _`2.X`: https://github.com/toastdriven/django-haystack/tree/master

celery_haystack/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.7.2'
+__version__ = '0.8'
 
 
 def version_hook(config):

celery_haystack/tasks.py

@@ -13,7 +13,7 @@
         from haystack import site
         from haystack.exceptions import NotRegistered as IndexNotFoundException  # noqa
         legacy = True
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured("Haystack couldn't be imported: %s" % e)
 
 if settings.CELERY_HAYSTACK_TRANSACTION_SAFE and not getattr(settings, 'CELERY_ALWAYS_EAGER', False):
@@ -67,7 +67,7 @@ def get_instance(self, model_class, pk, **kwargs):
         logger = self.get_logger(**kwargs)
         instance = None
         try:
-            instance = model_class._default_manager.get(pk=int(pk))
+            instance = model_class._default_manager.get(pk=pk)
         except model_class.DoesNotExist:
             logger.error("Couldn't load %s.%s.%s. Somehow it went missing?" %
                          (model_class._meta.app_label.lower(),
@@ -83,22 +83,16 @@ def get_indexes(self, model_class, **kwargs):
         try:
             if legacy:
                 index_holder = site
-                yield index_holder.get_index(model_class)
+                yield index_holder.get_index(model_class), self.using
             else:
                 using_backends = connection_router.for_write(**{'models': [model_class]})
                 for using in using_backends:
                     index_holder = connections[using].get_unified_index()
-                    yield index_holder.get_index(model_class)
+                    yield index_holder.get_index(model_class), using
         except IndexNotFoundException:
             raise ImproperlyConfigured("Couldn't find a SearchIndex for %s." %
                                        model_class)
 
-    def get_handler_options(self, **kwargs):
-        options = {}
-        if legacy:
-            options['using'] = self.using
-        return options
-
     def run(self, action, identifier, **kwargs):
         """
         Trigger the actual index handler depending on the
@@ -115,24 +109,22 @@ def run(self, action, identifier, **kwargs):
 
         # Then get the model class for the object path
         model_class = self.get_model_class(object_path, **kwargs)
-        for current_index in self.get_indexes(model_class, **kwargs):
+        for current_index, using in self.get_indexes(model_class, **kwargs):
             current_index_name = ".".join([current_index.__class__.__module__,
                                            current_index.__class__.__name__])
 
             if action == 'delete':
                 # If the object is gone, we'll use just the identifier
                 # against the index.
                 try:
-                    handler_options = self.get_handler_options(**kwargs)
-                    current_index.remove_object(identifier, **handler_options)
-                except Exception, exc:
+                    current_index.remove_object(identifier, using=using)
+                except Exception as exc:
                     logger.exception(exc)
                     self.retry(exc=exc)
                 else:
                     msg = ("Deleted '%s' (with %s)" %
                            (identifier, current_index_name))
                     logger.debug(msg)
-                    return msg
             elif action == 'update':
                 # and the instance of the model class with the pk
                 instance = self.get_instance(model_class, pk, **kwargs)
@@ -144,16 +136,14 @@ def run(self, action, identifier, **kwargs):
                 # Call the appropriate handler of the current index and
                 # handle exception if neccessary
                 try:
-                    handler_options = self.get_handler_options(**kwargs)
-                    current_index.update_object(instance, **handler_options)
-                except Exception, exc:
+                    current_index.update_object(instance, using=using)
+                except Exception as exc:
                     logger.exception(exc)
                     self.retry(exc=exc)
                 else:
                     msg = ("Updated '%s' (with %s)" %
                            (identifier, current_index_name))
                     logger.debug(msg)
-                    return msg
             else:
                 logger.error("Unrecognized action '%s'. Moving on..." % action)
                 raise ValueError("Unrecognized action %s" % action)

celery_haystack/test_settings.py

@@ -1,5 +1,13 @@
 import os
 
+import django
+
+from celery import Celery
+
+app = Celery('celery_haystack')
+app.config_from_object('django.conf:settings')
+
+
 DEBUG = True
 
 TEST_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), 'tests'))
@@ -26,7 +34,8 @@
 CELERYD_LOG_LEVEL = "DEBUG"
 CELERY_DEFAULT_QUEUE = "celery-haystack"
 
-TEST_RUNNER = 'discover_runner.DiscoverRunner'
+if django.VERSION < (1, 6):
+    TEST_RUNNER = 'discover_runner.DiscoverRunner'
 
 if os.environ.get('HAYSTACK') == 'v1':
     HAYSTACK_SITECONF = 'celery_haystack.tests.search_sites'

celery_haystack/utils.py

@@ -11,7 +11,7 @@ def get_update_task(task_path=None):
     module, attr = import_path.rsplit('.', 1)
     try:
         mod = import_module(module)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured('Error importing module %s: "%s"' %
                                    (module, e))
     try:

docs/changelog.rst

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+v0.8 (2014-07-31)
+-------------------
+
+* Fix bug when using multiple Haystack indizes
+
+* Fixed merge bug where primary key of object was cast to int
+
+* Add compatibility for Python 3.3, 3.4, Celery 3.X
+
 v0.7.2 (2013-03-23)
 -------------------
 

requirements/v1.txt

@@ -2,6 +2,6 @@ django-discover-runner
 django-haystack==1.2.7
 django-celery
 celery
-Whoosh
+whoosh<2.5
 flake8
 coverage

setup.cfg

@@ -21,6 +21,8 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2.6
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3.3
+    Programming Language :: Python :: 3.4
     Topic :: Utilities
 requires-dist =
     django-appconf>=0.4.1