Add support for retry param for Whoosh file writer

.travis.yml

@@ -1,12 +1,14 @@
-sudo: required
-dist: trusty
+os: linux
+dist: bionic
 language: python
 python:
-    - 2.7
-    - 3.4
     - 3.5
     - 3.6
-    - pypy
+    - 3.7
+    - 3.8
+    - pypy3
+services:
+    - docker
 
 cache:
     apt: true
@@ -17,37 +19,26 @@ cache:
 addons:
     apt_packages:
         - binutils
-        - default-jdk
+        - openjdk-8-jdk
         - gdal-bin
-        - libgdal1h
-        - libgeos-c1
+        - libgdal20
+        - libgeos-c1v5
         - libproj-dev
-        - libxapian22
         - python-xapian
         - wajig
 
 before_install:
-    - sudo apt-get install -qy default-jre
     - mkdir -p $HOME/download-cache
-    # See https://www.elastic.co/guide/en/elasticsearch/reference/current/deb.html#deb-repo
-    - wget -qO - https://packages.elastic.co/GPG-KEY-elasticsearch | sudo apt-key add -
     - >
-        if [[ $VERSION_ES == '>=2.0.0,<3.0.0' ]];
+        if [[ $VERSION_ES == '>=2,<3' ]];
         then
-          echo "deb http://packages.elastic.co/elasticsearch/2.x/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-2.x.list
-          sudo apt-get update
-          sudo apt-get -qy --allow-downgrades install elasticsearch=2.4.6
-        elif [[ $VERSION_ES == '>=5.0.0,<6.0.0' ]];
+          docker run -d -p 9200:9200 elasticsearch:2.4.6-alpine
+        elif [[ $VERSION_ES == '>=5,<6' ]];
         then
-          echo "deb https://artifacts.elastic.co/packages/5.x/apt stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-5.x.list
-          sudo apt-get update -qy
-          sudo apt-get -y --allow-downgrades install elasticsearch=5.6.10
+          docker run -d -p 9200:9200 elasticsearch:5.6.10-alpine
         else
-          echo "deb http://packages.elastic.co/elasticsearch/1.7/debian stable main" | sudo tee -a /etc/apt/sources.list.d/elasticsearch-1.7.list
-          sudo apt-get update -qy
-          sudo apt-get -qy --allow-downgrades install elasticsearch=1.7.6
+          docker run -d -p 9200:9200 elasticsearch:1.7.6-alpine
         fi
-    - sudo service elasticsearch restart
 
 install:
     - pip install --upgrade setuptools
@@ -66,50 +57,37 @@ after_success:
     - codecov
 
 env:
-    matrix:
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
-        - DJANGO_VERSION=">=1.11,<2.0" VERSION_ES=">=5.0.0,<6.0.0"
-        - DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=5.0.0,<6.0.0"
-        - DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
-matrix:
+    global:
+        - JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
+    jobs:
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=1,<2"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=2,<3"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
+        - DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=5,<6"
+        - DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
+jobs:
     allow_failures:
-        - python: 'pypy'
+        - python: 'pypy3'
     exclude:
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=5.0.0,<6.0.0"
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
-        - python: 2.7
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
-        - python: 3.4
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
-        - python: 3.4
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
-        - python: 3.4
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=5.0.0,<6.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=2.0.0,<3.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.0,<2.1" VERSION_ES=">=1.0.0,<2.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=5.0.0,<6.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=2.0.0,<3.0.0"
-        - python: pypy
-          env: DJANGO_VERSION=">=2.1,<2.2" VERSION_ES=">=1.0.0,<2.0.0"
+        - python: pypy3
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=5,<6"
+        - python: pypy3
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=2,<3"
+        - python: pypy3
+          env: DJANGO_VERSION=">=2.2,<3.0" VERSION_ES=">=1,<2"
+        - python: pypy3
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
+        - python: pypy3
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
+        - python: pypy3
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=1,<2"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=2,<3"
+        - python: 3.5
+          env: DJANGO_VERSION=">=3.0,<3.1" VERSION_ES=">=5,<6"
 
 notifications:
     irc: 'irc.freenode.org#haystack'

README.rst

@@ -50,7 +50,7 @@ Requirements
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.7+ or Python 3.3+
+* Python 3.5+
 * A supported version of Django: https://www.djangoproject.com/download/#supported-versions
 
 Additionally, each backend has its own requirements. You should refer to

docs/conf.py

@@ -11,8 +11,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 import sys
 

docs/multiple_index.rst

@@ -9,7 +9,7 @@ support. This allows you to talk to several different engines at the same time.
 It enables things like master-slave setups, multiple language indexing,
 separate indexes for general search & autocomplete as well as other options.
 
-.. _`multiple database support`: http://docs.djangoproject.com/en/1.3/topics/db/multi-db/
+.. _`multiple database support`: http://docs.djangoproject.com/en/dev/topics/db/multi-db/
 
 
 Specifying Available Connections

docs/searchindex_api.rst

@@ -332,7 +332,6 @@ object and write its ``prepare`` method to populate/alter the data any way you
 choose. For instance, a (naive) user-created ``GeoPointField`` might look
 something like::
 
-    from django.utils import six
     from haystack import indexes
 
     class GeoPointField(indexes.CharField):
@@ -341,7 +340,7 @@ something like::
             super(GeoPointField, self).__init__(**kwargs)
 
         def prepare(self, obj):
-            return six.text_type("%s-%s" % (obj.latitude, obj.longitude))
+            return "%s-%s" % (obj.latitude, obj.longitude)
 
 The ``prepare`` method simply returns the value to be used for that field. It's
 entirely possible to include data that's not directly referenced to the object
@@ -615,4 +614,3 @@ For the impatient::
         def index_queryset(self, using=None):
             "Used when the entire index for model is updated."
             return Note.objects.filter(pub_date__lte=datetime.datetime.now())
-

docs/spatial.rst

@@ -33,7 +33,7 @@ Support
 =======
 
 You need the latest & greatest of either Solr or Elasticsearch. None of the
-other backends (specifially the engines) support this kind of search.
+other backends (specifically the engines) support this kind of search.
 
 For Solr_, you'll need at least **v3.5+**. In addition, if you have an existing
 install of Haystack & Solr, you'll need to upgrade the schema & reindex your

docs/tutorial.rst

@@ -157,7 +157,16 @@ Example (ElasticSearch 2.x)::
             'INDEX_NAME': 'haystack',
         },
     }
+
+Example (ElasticSearch 5.x)::
 
+    HAYSTACK_CONNECTIONS = {
+        'default': {
+            'ENGINE': 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine',
+            'URL': 'http://127.0.0.1:9200/',
+            'INDEX_NAME': 'haystack',
+        },
+    }
 
 Whoosh
 ~~~~~~

example_project/bare_bones_app/models.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 
 from django.db import models
@@ -14,7 +11,7 @@ class Cat(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
     updated = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     @models.permalink

example_project/bare_bones_app/search_indexes.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from bare_bones_app.models import Cat
 
 from haystack import indexes

example_project/regular_app/models.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import datetime
 
 from django.db import models
@@ -25,7 +22,7 @@ class Dog(models.Model):
     created = models.DateTimeField(default=datetime.datetime.now)
     updated = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.full_name()
 
     @models.permalink
@@ -43,5 +40,5 @@ class Toy(models.Model):
     dog = models.ForeignKey(Dog, related_name="toys")
     name = models.CharField(max_length=60)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s's %s" % (self.dog.name, self.name)

example_project/regular_app/search_indexes.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from regular_app.models import Dog
 
 from haystack import indexes

example_project/settings.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import os
 
 from django.conf import settings

haystack/__init__.py

@@ -1,7 +1,4 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from pkg_resources import DistributionNotFound, get_distribution, parse_version
@@ -13,7 +10,7 @@
 __author__ = "Daniel Lindsley"
 
 try:
-    pkg_distribution = get_distribution(__name__)
+    pkg_distribution = get_distribution("django-haystack")
     __version__ = pkg_distribution.version
     version_info = pkg_distribution.parsed_version
 except DistributionNotFound:

haystack/admin.py

@@ -1,23 +1,21 @@
 # encoding: utf-8
-
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from django.contrib.admin.options import ModelAdmin, csrf_protect_m
 from django.contrib.admin.views.main import SEARCH_VAR, ChangeList
 from django.core.exceptions import PermissionDenied
 from django.core.paginator import InvalidPage, Paginator
 from django.shortcuts import render
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.translation import ungettext
 
 from haystack import connections
+from haystack.constants import DEFAULT_ALIAS
 from haystack.query import SearchQuerySet
 from haystack.utils import get_model_ct_tuple
 
 
 class SearchChangeList(ChangeList):
     def __init__(self, **kwargs):
-        self.haystack_connection = kwargs.pop("haystack_connection", "default")
+        self.haystack_connection = kwargs.pop("haystack_connection", DEFAULT_ALIAS)
         super(SearchChangeList, self).__init__(**kwargs)
 
     def get_results(self, request):
@@ -61,7 +59,7 @@ def get_results(self, request):
 
 class SearchModelAdminMixin(object):
     # haystack connection to use for searching
-    haystack_connection = "default"
+    haystack_connection = DEFAULT_ALIAS
 
     @csrf_protect_m
     def changelist_view(self, request, extra_context=None):
@@ -135,7 +133,7 @@ def changelist_view(self, request, extra_context=None):
         )
 
         context = {
-            "module_name": force_text(self.model._meta.verbose_name_plural),
+            "module_name": force_str(self.model._meta.verbose_name_plural),
             "selection_note": selection_note % {"count": len(changelist.result_list)},
             "selection_note_all": selection_note_all
             % {"total_count": changelist.result_count},

haystack/apps.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.apps import AppConfig