Remove haystack v1 support

Author: stefanw

.travis.yml

@@ -8,16 +8,16 @@ before_install:
   - export DJANGO_SETTINGS_MODULE=celery_haystack.test_settings
 install:
   - pip install -e .
-  - pip install -r requirements/$HAYSTACK.txt $DJANGO
+  - pip install -r requirements/v2.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="Django==1.8.7" HAYSTACK=v2
-  - DJANGO="Django==1.9" HAYSTACK=v2
+  - DJANGO="Django==1.8.7"
+  - DJANGO="Django==1.9"
 matrix:
   exclude:
-  - env: DJANGO="Django==1.9" HAYSTACK=v2
+  - env: DJANGO="Django==1.9"
     python: "3.3"

celery_haystack/conf.py

@@ -1,6 +1,6 @@
 from django.conf import settings  # noqa
 from django.core.exceptions import ImproperlyConfigured
-from haystack import constants, __version__ as haystack_version
+from haystack import constants
 from haystack.management.commands import update_index as cmd
 from appconf import AppConf
 
@@ -56,7 +56,7 @@ def configure(self):
 signal_processor = getattr(settings, 'HAYSTACK_SIGNAL_PROCESSOR', None)
 
 
-if haystack_version[0] >= 2 and signal_processor is None:
+if signal_processor is None:
     raise ImproperlyConfigured("When using celery-haystack with Haystack 2.X "
                                "the HAYSTACK_SIGNAL_PROCESSOR setting must be "
                                "set. Use 'celery_haystack.signals."

celery_haystack/indexes.py

@@ -1,53 +1,5 @@
-from django.db.models import signals
-
 from haystack import indexes
 
-from .utils import enqueue_task
-
 
 class CelerySearchIndex(indexes.SearchIndex):
-    """
-    A ``SearchIndex`` subclass that enqueues updates/deletes for later
-    processing using Celery.
-    """
-    # We override the built-in _setup_* methods to connect the enqueuing
-    # operation.
-    def _setup_save(self, model):
-        signals.post_save.connect(self.enqueue_save,
-                                  sender=model,
-                                  dispatch_uid=CelerySearchIndex)
-
-    def _setup_delete(self, model):
-        signals.post_delete.connect(self.enqueue_delete,
-                                    sender=model,
-                                    dispatch_uid=CelerySearchIndex)
-
-    def _teardown_save(self, model):
-        signals.post_save.disconnect(self.enqueue_save,
-                                     sender=model,
-                                     dispatch_uid=CelerySearchIndex)
-
-    def _teardown_delete(self, model):
-        signals.post_delete.disconnect(self.enqueue_delete,
-                                       sender=model,
-                                       dispatch_uid=CelerySearchIndex)
-
-    def enqueue_save(self, instance, **kwargs):
-        if not getattr(instance, 'skip_indexing', False):
-            return self.enqueue('update', instance)
-
-    def enqueue_delete(self, instance, **kwargs):
-        if not getattr(instance, 'skip_indexing', False):
-            return self.enqueue('delete', instance)
-
-    def enqueue(self, action, instance):
-        """
-        Shoves a message about how to update the index into the queue.
-
-        This is a standardized string, resembling something like::
-
-            ``notes.note.23``
-            # ...or...
-            ``weblog.entry.8``
-        """
-        return enqueue_task(action, instance)
+    pass

celery_haystack/tasks.py

@@ -1,30 +1,14 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
-try:
-    from django.apps import apps
-    get_model = apps.get_model
-except ImportError:
-    from django.db.models.loading import get_model
+from django.apps import apps
+get_model = apps.get_model
 
 from .conf import settings
 
-try:
-    from haystack import connections, connection_router
-    from haystack.exceptions import NotHandled as IndexNotFoundException
-    legacy = False
-except ImportError:
-    try:
-        from haystack import site
-        from haystack.exceptions import NotRegistered as IndexNotFoundException  # noqa
-        legacy = True
-    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):
-    from djcelery_transactions import PostTransactionTask as Task
-else:
-    from celery.task import Task  # noqa
+from haystack import connections, connection_router
+from haystack.exceptions import NotHandled as IndexNotFoundException
 
+from celery.task import Task  # noqa
 from celery.utils.log import get_task_logger
 
 logger = get_task_logger(__name__)
@@ -87,14 +71,10 @@ def get_indexes(self, model_class, **kwargs):
         Fetch the model's registered ``SearchIndex`` in a standarized way.
         """
         try:
-            if legacy:
-                index_holder = site
-                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), using
+            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), using
         except IndexNotFoundException:
             raise ImproperlyConfigured("Couldn't find a SearchIndex for %s." %
                                        model_class)

celery_haystack/tests/search_indexes.py

@@ -1,24 +1,12 @@
-from haystack import indexes, __version__ as haystack_version
+from haystack import indexes
 
 from .models import Note
 from ..indexes import CelerySearchIndex
 
-if haystack_version[:2] < (2, 0):
-    from haystack import site
-
-    class Indexable(object):
-        pass
-    indexes.Indexable = Indexable
-else:
-    site = None  # noqa
-
 
 # Simplest possible subclass that could work.
 class NoteIndex(CelerySearchIndex, indexes.Indexable):
     text = indexes.CharField(document=True, model_attr='content')
 
     def get_model(self):
         return Note
-
-if site:
-    site.register(Note, NoteIndex)