Fix Whoosh settings and test settings to usu sqlite

Gust · Sergio Oliveira
1 parent 2ac50238
Showing 3 changed files with 4 additions and 6 deletions Show diff stats
colab/settings.py
setup.py
tests/settings.py
@@ -166,6 +166,7 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = &#39;colab.utils.highlighting.ColabHighlighter&#39;
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     }
 }
@@ -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',
@@ -41,10 +41,7 @@ SECRET_KEY = &#39;not-a-secret&#39;
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': 'localhost',
-        'NAME': 'colab',
-        'USER': 'colab',
-        'PASSWORD': 'colab',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'colab.sqlite',
     }
 }
	@@ -166,6 +166,7 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'colab.utils.highlighting.ColabHighlighter'		@@ -166,6 +166,7 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'colab.utils.highlighting.ColabHighlighter'
166	HAYSTACK_CONNECTIONS = {	166	HAYSTACK_CONNECTIONS = {
167	'default': {	167	'default': {
168	'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',	168	'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
		169	+ 'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
169	}	170	}
170	}	171	}
171		172
	@@ -3,7 +3,7 @@ from setuptools import setup, find_packages		@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
3		3
4		4
5	REQUIREMENTS = [	5	REQUIREMENTS = [
6	- 'Django>=1.7.8',	6	+ 'Django>=1.7.8,<1.8',
7	'pytz>=2011n',	7	'pytz>=2011n',
8	'django-hitcounter>=0.1.1',	8	'django-hitcounter>=0.1.1',
9	'django-tastypie>=0.12.1',	9	'django-tastypie>=0.12.1',