diff --git a/.travis.yml b/.travis.yml index 89be4df36e36dea19cda2509d5a5d1cca45cfd18..3ed2151ff1a96a6d1901a1dac23a235dccddb598 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,23 +1,24 @@ 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" diff --git a/celery_haystack/tasks.py b/celery_haystack/tasks.py index 09e54dec0825c5314bafd7e09d696fdec92232bc..d8acedd3fa94619c617fbc623b600816d8e00c35 100644 --- a/celery_haystack/tasks.py +++ b/celery_haystack/tasks.py @@ -1,7 +1,6 @@ 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'." % diff --git a/celery_haystack/test_settings.py b/celery_haystack/test_settings.py index def8536da2297f646e1e3815ad6267c0b9adb607..0446cbfe33254dabb2d6decdd49d813c3b6dcf9f 100644 --- a/celery_haystack/test_settings.py +++ b/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', ] diff --git a/requirements/v2.txt b/requirements/v2.txt index 028e967357d45e5d6c6c8ba905a557e32942f1da..7e08873af1d5924f19179553740b2d1c3f386391 100644 --- a/requirements/v2.txt +++ b/requirements/v2.txt @@ -1,6 +1,5 @@ django-discover-runner django-haystack -django-celery celery Whoosh flake8