Added support for Django 1.10 and Sphinx 2.2.10.

Also dropped support for Django 1.7.

.travis.yml

@@ -1,17 +1,22 @@
 language: python
 python:
-  - "3.3"
+  - "3.4"
 
 env:
-  - BACKEND=mysql SPHINX_VERSION=2.2.6
-  - BACKEND=mysql SPHINX_VERSION=2.2.10
-  - BACKEND=postgres SPHINX_VERSION=2.2.6
-  - BACKEND=postgres SPHINX_VERSION=2.2.10
+  - DJANGO_VERSION=1.8 BACKEND=mysql SPHINX_VERSION=2.2.10
+  - DJANGO_VERSION=1.8 BACKEND=mysql SPHINX_VERSION=2.2.11
+  - DJANGO_VERSION=1.8 BACKEND=psycopg2 SPHINX_VERSION=2.2.10
+  - DJANGO_VERSION=1.8 BACKEND=psycopg2 SPHINX_VERSION=2.2.11
+  - DJANGO_VERSION=1.10 BACKEND=mysql SPHINX_VERSION=2.2.10
+  - DJANGO_VERSION=1.10 BACKEND=mysql SPHINX_VERSION=2.2.11
+  - DJANGO_VERSION=1.10 BACKEND=psycopg2 SPHINX_VERSION=2.2.10
+  - DJANGO_VERSION=1.10 BACKEND=psycopg2 SPHINX_VERSION=2.2.11
 
 install:
   - sudo bash -c "$(curl -fsSL https://gist.githubusercontent.com/jorgecarleitao/ee5cede492dbe41be8a5/raw/install_sphinx.sh)" ${SPHINX_VERSION}
   - pip install .
-  - pip install django psycopg2 pymysql
+  - pip install PyMySQL psycopg2
+  - pip install django==$DJANGO_VERSION
   - pip install coveralls
 
 script:

README.md

@@ -14,21 +14,23 @@ Specifically, this API allows you to:
 
 1. Configure Sphinx with Python.
 2. Index Django models in Sphinx.
-3. Execute Sphinx queries (SphinxQL) using a Django-like expressions and have the 
+3. Execute Sphinx queries (SphinxQL) using Django-like expressions and have the 
 results as Django models.
 
 Django-SphinxQL requires:
 
 - Python 3
-- mysql or postgres
+- pymysql
 - Django (>=1.8)
 - Sphinx
+- A backend (pymysql or psycopg2)
 
-Our build matrix in Travis has 4 builds:
+Our build matrix in Travis has 8 builds:
 
-- Python 3.3 with latest Django
-- Sphinx 2.2.6 and 2.2.10
-- mysql and postgres backend
+- Python 3.4
+- Django 1.8 and 1.10
+- Sphinx 2.2.10 and 2.2.11
+- mysql and postgres backends
 
 For more details, you can check the directory `tests` and `.travis.yml`.
 

requirements.txt

@@ -0,0 +1,2 @@
+django>=1.8
+pymysql

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='django-sphinxql',
-      version='1.0.0',
+      version='1.1.0',
       description='Sphinx search on Django',
       long_description=open('README.md').read(),
       author='Jorge C. Leitão',

sphinxql/apps.py

@@ -17,9 +17,12 @@ def ready(self):
         it and doesn't index the models.
         """
         for app in apps.get_app_configs():
+            module_name = app.module.__package__ + '.indexes'
             try:
-                __import__(app.module.__package__ + '.indexes')
-            except ImportError:
+                __import__(module_name)
+            except ImportError as e:
+                if module_name not in str(e):
+                    raise
                 # ignore apps without indexes.
                 pass
 

sphinxql/configuration/configurators.py

@@ -113,8 +113,9 @@ def special_annotate(query, dict_values):
 
         # Add the aggregates to the query
         for (alias, aggregate_expr) in dict_values.items():
-            obj.query.add_aggregate(aggregate_expr, query.model, alias,
-                                    is_summary=False)
+            obj.query.add_annotation(aggregate_expr, alias, is_summary=False)
+            # obj.query.add_aggregate(aggregate_expr, query.model, alias,
+            #                         is_summary=False)
 
         return obj
 

sphinxql/management/commands/start_sphinx.py

@@ -7,7 +7,6 @@
 
 class Command(BaseCommand):
     help = 'Interacts with search deamon.'
-    option_list = BaseCommand.option_list
 
     def handle(self, **options):
         self.stdout.write('Starting Sphinx')

sphinxql/management/commands/stop_sphinx.py

@@ -7,7 +7,6 @@
 
 class Command(BaseCommand):
     help = 'Interacts with search deamon.'
-    option_list = BaseCommand.option_list
 
     def handle(self, **options):
         self.stdout.write('Stopping Sphinx')

tests/foreign_relationships/indexes.py

@@ -1,5 +1,5 @@
-from django.db.models import F, CharField
-from django.db.models.functions import Concat, Value
+from django.db.models import F, CharField, Value
+from django.db.models.functions import Concat
 from sphinxql import indexes, fields
 
 from .models import Document

tests/settings_test.py

@@ -19,8 +19,8 @@
 #         },
 # }
 
-INSTALLED_APPS = ('sphinxql', 'tests.query', 'tests.queryset',
-                  'tests.indexing', 'tests.foreign_relationships')
+INSTALLED_APPS = ('tests.query', 'tests.queryset',
+                  'tests.indexing', 'tests.foreign_relationships', 'sphinxql')
 
 SECRET_KEY = "django_tests_secret_key"