Commit 998a1f761e97f7396265e6e65d063007d013a62b

Authored by Gust
1 parent 1eaf769c
Exists in workin_whoosh_temp

Fix Whoosh settings and test settings to usu sqlite

colab/settings.py
... ... @@ -169,6 +169,7 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'colab.utils.highlighting.ColabHighlighter'
169 169 HAYSTACK_CONNECTIONS = {
170 170 'default': {
171 171 'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
  172 + 'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
172 173 }
173 174 }
174 175  
... ...
setup.py
... ... @@ -3,7 +3,7 @@ from setuptools import setup, find_packages
3 3  
4 4  
5 5 REQUIREMENTS = [
6   - 'Django>=1.7.8',
  6 + 'Django>=1.7.8,<1.8',
7 7 'pytz>=2011n',
8 8 'django-hitcounter>=0.1.1',
9 9 'django-tastypie>=0.12.1',
... ...
tests/settings.py
... ... @@ -41,10 +41,7 @@ SECRET_KEY = &#39;not-a-secret&#39;
41 41  
42 42 DATABASES = {
43 43 'default': {
44   - 'ENGINE': 'django.db.backends.postgresql_psycopg2',
45   - 'HOST': 'localhost',
46   - 'NAME': 'colab',
47   - 'USER': 'colab',
48   - 'PASSWORD': 'colab',
  44 + 'ENGINE': 'django.db.backends.sqlite3',
  45 + 'NAME': 'colab.sqlite',
49 46 }
50 47 }
... ...