diff --git a/colab/settings.py b/colab/settings.py index 62d6202..e81e206 100644 --- a/colab/settings.py +++ b/colab/settings.py @@ -169,6 +169,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