From 443bf4ebab3b3c0b238552f111ba6012974b11bf Mon Sep 17 00:00:00 2001
From: Gust <darksshades@hotmail.com>
Date: Wed, 17 Jun 2015 08:57:32 -0300
Subject: [PATCH] Fix Whoosh settings and test settings to usu sqlite

---
 colab/settings.py | 1 +
 setup.py          | 2 +-
 tests/settings.py | 7 ++-----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/colab/settings.py b/colab/settings.py
index 7c58233..d0d7b86 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -166,6 +166,7 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'colab.utils.highlighting.ColabHighlighter'
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     }
 }
 
diff --git a/setup.py b/setup.py
index 787dad9..50098ec 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 
 REQUIREMENTS = [
-    'Django>=1.7.8',
+    'Django>=1.7.8,<1.8',
     'pytz>=2011n',
     'django-hitcounter>=0.1.1',
     'django-tastypie>=0.12.1',
diff --git a/tests/settings.py b/tests/settings.py
index 8e6bed1..7157ac0 100644
--- a/tests/settings.py
+++ b/tests/settings.py
@@ -41,10 +41,7 @@ SECRET_KEY = 'not-a-secret'
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': 'localhost',
-        'NAME': 'colab',
-        'USER': 'colab',
-        'PASSWORD': 'colab',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'colab.sqlite',
     }
 }
--
libgit2 0.21.2