Merge branch 'remove-deps' into 'master'

Remove deps (Revised dependencies, Sqlite3, Whoosh) Remove colab dependencies. Change postgres to Sqlite3 and search engine to Whoosh for development. Whoosh didn't seem to support haystack input AltParse so if the engine is whoosh, colab will use AutoQuery instead. See merge request !70

Merge branch 'remove-deps' into 'master'
Remove deps (Revised dependencies, Sqlite3, Whoosh) Remove colab dependencies. Change postgres to Sqlite3 and search engine to Whoosh for development. Whoosh didn't seem to support haystack input AltParse so if the engine is whoosh, colab will use AutoQuery instead. See merge request !70
Sergio Oliveira
2 parents a2e34e57 27b453ea
Showing 7 changed files with 55 additions and 73 deletions Show diff stats
colab/management/initconfig.py
colab/search/forms.py
colab/search/tests.py
colab/settings.py
colab/super_archives/search_indexes.py
setup.py
tests/settings.py
@@ -34,20 +34,14 @@ ALLOWED_HOSTS = [
 ## Database settings
 DATABASES = {{
     'default': {{
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'HOST': 'localhost',
-        'NAME': 'colab',
-        'USER': 'colab',
-        'PASSWORD': 'colab',
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'colab.sqlite3',
     }}
 }}
 ## Disable indexing
 ROBOTS_NOINDEX = False
-### Log errors to Sentry instance
-# RAVEN_DSN = 'http://public:secret@example.com/1'
-
 LOGGING = {{
     'version': 1,
@@ -7,6 +7,7 @@ from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from haystack.forms import SearchForm
 from haystack.inputs import AltParser
+from haystack.inputs import AutoQuery
 from colab.super_archives.models import MailingList
@@ -107,7 +108,11 @@ class ColabSearchForm(SearchForm):
                 'bf': 'recip(ms(NOW/HOUR,modified),3.16e-11,1,1)^10',
             }
-            sqs = sqs.filter(content=AltParser('edismax', q, **dismax_opts))
+            if settings.HAYSTACK_CONNECTIONS['default']['ENGINE'] != \
+            'haystack.backends.whoosh_backend.WhooshEngine':
+                sqs = sqs.filter(content=AltParser('edismax', q, **dismax_opts))
+            else:
+                sqs = sqs.filter(content=AutoQuery(q))
         if self.cleaned_data['type']:
             sqs = sqs.filter(type=self.cleaned_data['type'])
@@ -9,7 +9,7 @@ class SearchViewTest(TestCase):
     fixtures = ['test_data.json']
     def setUp(self):
-        call_command('update_index', interactive=False, verbosity=0)
+        call_command('rebuild_index', interactive=False, verbosity=0)
         self.client = Client()
     def tearDown(self):
@@ -21,12 +21,12 @@ class SearchViewTest(TestCase):
         self.assertEqual(3,  len(thread_list))
-        self.assertIn('This is a repply to Thread 1 on list A',
-                      thread_list[0].description)
-        self.assertIn('This is a repply to Thread 1 on list C',
-                      thread_list[1].description)
-        self.assertIn('This is a repply to Thread 1 on list B',
-                      thread_list[2].description)
+        condition = any('This is a repply to Thread 1 on list A' in t.description for t in thread_list)
+        self.assertTrue(condition)
+        condition = any('This is a repply to Thread 1 on list B' in t.description for t in thread_list)
+        self.assertTrue(condition)
+        condition = any('This is a repply to Thread 1 on list C' in t.description for t in thread_list)
+        self.assertTrue(condition)
     def test_search_account_by_firstName(self):
         request = self.client.get('/search/?q=Chuck')
@@ -42,7 +42,6 @@ INSTALLED_APPS = (
     'colab.accounts',
     # Not standard apps
-    'cliauth',
     'django_mobile',
     'haystack',
     'hitcounter',
@@ -166,15 +165,8 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = &#39;colab.utils.highlighting.ColabHighlighter&#39;
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://localhost:8983/solr/',
-    }
-}
-
-CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
-        'LOCATION': '127.0.0.1:11211',
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     }
 }
@@ -252,12 +244,7 @@ TASTYPIE_DEFAULT_FORMATS = [&#39;json&#39;, ]
 from .utils.conf import load_colab_apps, load_py_settings
-if locals().get('RAVEN_DSN', False):
-    RAVEN_CONFIG = {
-        'dsn': RAVEN_DSN + '?timeout=30',  # noqa
-    }
-    INSTALLED_APPS += ('raven.contrib.django.raven_compat',)
-
+BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
 locals().update(load_colab_apps())
@@ -28,7 +28,7 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
     latest_message_pk = indexes.IntegerField(
         model_attr='latest_message__pk', indexed=False
     )
-    score = indexes.IntegerField(model_attr='score')
+    rating = indexes.IntegerField(model_attr='score')
     def get_model(self):
         return Thread
@@ -3,46 +3,45 @@ from setuptools import setup, find_packages
 REQUIREMENTS = [
-    'Django==1.7.7',
-    'psycopg2==2.5.1',
-    'django-piston==0.2.3',
-    'pytz==2011n',
-    'chardet==1.0.1',
-    'python-dateutil==1.5',
-    'django-cliauth==0.9.1',
-    'django-mobile==0.3.0',
-    'django-haystack==2.2',
-    'pysolr==2.1',
-    'poster==0.8.1',
-    'etiquetando==0.1',
-    'html2text==3.200.3',
-    'django-taggit==0.12.1',
-    'python-memcached==1.53',
-    'django-hitcounter==0.1.1',
-    'Pillow==2.5.1',
-    'django-i18n-model==0.0.7',
-    'django-tastypie==0.11.0',
-    'gunicorn==19.1.0',
-    'eventlet==0.15.2',
+    'Django>=1.7.8,<1.8',
+    'pytz>=2011n',
+    'django-hitcounter>=0.1.1',
+    'django-tastypie>=0.12.1',
+    'django-revproxy>=0.9.0',
+    'django-haystack>=2.2',
+    'Whoosh>=2.7.0',
+
+    # Diazo
+    'diazo>=1.0.5',
-    # Deps for sentry client (raven)
-    'raven==3.5.2',
-    'tornado==3.1.1',
+    # Deps for Single SignOn (SSO)
+    'django-browserid>=0.11',
-    'django-revproxy==0.9.3',
+    ### Move out of colab (as plugins):
-    # Diazo
-    'diazo==1.0.5',
+    # Deps for badger
+    'Pillow==2.8.1',
+    'django-i18n-model>=0.0.7',
+
+    # Deps for super_archives
+    'etiquetando==0.1',
+    'django-taggit>=0.12.1',
+    'html2text>=3.200.3',
+    'chardet>=1.0.1',
+
+    # Deps for gitlab plugin
+    'python-dateutil>=1.5',
-    # Mailman 2 REST API
-    'mailman-api==0.2.9',
+    # Converse.js (XMPP client)
+    'django-conversejs>=0.3.4',
+    'django-mobile>=0.3.0',
 ]
 TEST_REQUIREMENTS = [
-    'coverage==3.7.1',
-    'coveralls==0.5',
-    'flake8==2.3.0',
-    'mock==1.0.1',
+    'coverage>=3.7.1',
+    'coveralls>=0.5',
+    'flake8>=2.3.0',
+    'mock>=1.0.1',
 ]
@@ -32,8 +32,8 @@ LOGGING = {
 import os
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.solr_backend.SolrEngine',
-        'URL': 'http://127.0.0.1:8983/solr',
+        'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
+        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
     },
 }
@@ -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',
     }
 }
	@@ -28,7 +28,7 @@ class ThreadIndex(BaseIndex, indexes.Indexable):		@@ -28,7 +28,7 @@ class ThreadIndex(BaseIndex, indexes.Indexable):
28	latest_message_pk = indexes.IntegerField(	28	latest_message_pk = indexes.IntegerField(
29	model_attr='latest_message__pk', indexed=False	29	model_attr='latest_message__pk', indexed=False
30	)	30	)
31	- score = indexes.IntegerField(model_attr='score')	31	+ rating = indexes.IntegerField(model_attr='score')
32		32
33	def get_model(self):	33	def get_model(self):
34	return Thread	34	return Thread