Merge pull request #66 from django-haystack/fix-travis

Fix travis matrix

.travis.yml

 language: python
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
   - "3.5"
+  - "3.6"
 before_install:
   - export DJANGO_SETTINGS_MODULE=celery_haystack.test_settings
 install:
   - pip install -e .
   - pip install -r requirements/v2.txt $DJANGO
 before_script:
-  - flake8 celery_haystack --ignore=E501
+  - flake8 celery_haystack --ignore=E501,E731
 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"
-  - DJANGO="Django==1.9"
-matrix:
-  exclude:
-  - env: DJANGO="Django==1.9"
-    python: "3.3"
+  - DJANGO="Django>=1.8,<1.9"
+  - DJANGO="Django>=1.9,<1.10"
+  - DJANGO="Django>=1.10,<1.11"
+  - DJANGO="Django>=1.11,<1.12"
+
+notifications:
+    irc: "irc.freenode.org#haystack"

celery_haystack/tasks.py

 from django.core.exceptions import ImproperlyConfigured
 from django.core.management import call_command
 from django.apps import apps
-get_model = apps.get_model
 
 from .conf import settings
 
@@ -44,7 +43,7 @@ class CeleryHaystackSignalHandler(Task):
         bits = object_path.split('.')
         app_name = '.'.join(bits[:-1])
         classname = bits[-1]
-        model_class = get_model(app_name, classname)
+        model_class = apps.get_model(app_name, classname)
 
         if model_class is None:
             raise ImproperlyConfigured("Could not load model '%s'." %

celery_haystack/test_settings.py

@@ -12,7 +12,6 @@ TEST_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), 'tests'))
 
 INSTALLED_APPS = [
     'haystack',
-    'djcelery',
     'celery_haystack',
     'celery_haystack.tests',
 ]

requirements/v2.txt

 django-discover-runner
 django-haystack
-django-celery
 celery
 Whoosh
 flake8