From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 30 Apr 2015 09:24:17 +0000 (+0200)
Subject: update django-haystack version to 2.4 from github
X-Git-Tag: 1.6a~4^2~101
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e5d348a1a944a6e1a6d466a603a80953a31744c2;p=telemeta.git

update django-haystack version to 2.4 from github
---

diff --git a/setup.py b/setup.py
index 1bc69481..e1bf7922 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ setup(
   author_email = "yomguy@parisson.com",
   version = '1.5.2',
   install_requires = [
-        'django==1.6.10',
+        'django==1.6.11',
         'django-registration',
         'django-extensions',
         'django-timezones',
@@ -64,7 +64,7 @@ setup(
         'django-google-tools',
         'django-ipauth',
         'django-celery',
-        'django-haystack',
+        # 'django-haystack',
         'timeside>=0.7',
         'south',
         'docutils',
@@ -76,7 +76,9 @@ setup(
         'ebooklib',
     ],
   tests_require=['pytest-django', 'pytest-cov', 'factory-boy'],
-  dependency_links = ['https://github.com/mariocesar/sorl-thumbnail/tarball/master#egg=sorl-thumbnail-12.2'],
+  dependency_links = ['https://github.com/mariocesar/sorl-thumbnail/tarball/master#egg=sorl-thumbnail-12.2',
+                      'https://github.com/django-haystack/django-haystack/tarball/master#egg=django-haystack-2.4',
+                      ],
   # Provide a test command through django-setuptest
   cmdclass={'test': PyTest},
   platforms=['OS Independent'],