Merge 83dcaa1 into 0d8895b

.travis.yml

@@ -3,18 +3,18 @@ language: python
 
 matrix:
     include:
+        - python: 3.8
+          env: DJANGO_VERSION=">=3.1,<3.2" XAPIAN_VERSION=1.4.9
+        - python: 3.8
+          env: DJANGO_VERSION=">=3.0,<3.1" XAPIAN_VERSION=1.4.9
+        - python: 3.7
+          env: DJANGO_VERSION=">=2.2,<3.0" XAPIAN_VERSION=1.4.9
         - python: 3.7
           env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
-          dist: xenial
-          sudo: true
         - python: 3.7
           env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
-          dist: xenial
-          sudo: true
         - python: 3.7
           env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
-          dist: xenial
-          sudo: true
         - python: 3.6
           env: DJANGO_VERSION=">=2.1,<2.2" XAPIAN_VERSION=1.4.9
         - python: 3.6
@@ -27,10 +27,6 @@ matrix:
           env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
         - python: 3.5
           env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
-        - python: 3.4
-          env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.4.9
-        - python: 3.4
-          env: DJANGO_VERSION=">=1.11,<2.0" XAPIAN_VERSION=1.4.9
         - python: 3.4
           env: DJANGO_VERSION=">=2.0,<2.1" XAPIAN_VERSION=1.3.6
         - python: 3.4
@@ -65,6 +61,7 @@ install:
 
 script:
   - cd django-haystack/
+  - PYTHONPATH=`pwd` `which django-admin.py` migrate --settings=test_haystack.xapian_settings
   - PYTHONPATH=`pwd` coverage run `which django-admin.py` test test_haystack.xapian_tests --settings=test_haystack.xapian_settings
 
 after_success: coveralls

tests/xapian_settings.py

@@ -4,7 +4,9 @@
 INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.admin',
+    'django.contrib.messages',
     'django.contrib.contenttypes',
+    'haystack',
     'test_haystack.core',
     'test_haystack.xapian_tests',
 ]