Merge pull request #145 from noamkush/support_dsl_6_4

Add support for django-elasticsearch-dsl 6.4

Author: barseghyanartur

.travis.yml

@@ -28,7 +28,7 @@ matrix:
     python: 3.7
 
 before_install:
-  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.16.deb && sudo dpkg -i --force-confnew elasticsearch-5.6.16.deb && sudo service elasticsearch restart
+  - curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.5.4.deb && sudo dpkg -i --force-confnew elasticsearch-6.5.4.deb && sudo service elasticsearch restart
 
 install: pip install -r examples/requirements/test.txt
 

docs/advanced_usage_examples.rst

@@ -234,7 +234,7 @@ Document index
 .. code-block:: python
 
     from django.conf import settings
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from elasticsearch_dsl import analyzer
 
     from books.models import Book
@@ -257,7 +257,7 @@ Document index
 
 
     @INDEX.doc_type
-    class BookDocument(DocType):
+    class BookDocument(Document):
         """Book Elasticsearch document."""
 
         id = fields.IntegerField(attr='id')
@@ -326,7 +326,7 @@ Document index
         class Meta(object):
             """Meta options."""
 
-            model = Book  # The model associate with this DocType
+            model = Book  # The model associate with this Document
 
 Sample serializer
 -----------------
@@ -964,7 +964,7 @@ documents using ``fields.CompletionField``.
 
     from django.conf import settings
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
 
     from books.models import Publisher
 
@@ -979,7 +979,7 @@ documents using ``fields.CompletionField``.
 
 
     @INDEX.doc_type
-    class PublisherDocument(DocType):
+    class PublisherDocument(Document):
         """Publisher Elasticsearch document."""
 
         id = fields.IntegerField(attr='id')
@@ -1028,7 +1028,7 @@ documents using ``fields.CompletionField``.
         class Meta(object):
             """Meta options."""
 
-            model = Publisher  # The model associate with this DocType
+            model = Publisher  # The model associate with this Document
 
 After that the ``name.suggest``, ``city.suggest``, ``state_province.suggest``
 and ``country.suggest`` fields would be available for suggestions feature.
@@ -1324,7 +1324,7 @@ In that case, the document definition should be altered as follows:
 
 .. code-block:: python
 
-    class BookDocument(DocType):
+    class BookDocument(Document):
 
         # ...
 
@@ -1418,7 +1418,7 @@ In that case, the document definition should be altered as follows:
 
 .. code-block:: python
 
-    class AddressDocument(DocType):
+    class AddressDocument(Document):
 
         # ...
 
@@ -1513,7 +1513,7 @@ Document definition
 
     from django.conf import settings
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
 
     from books.models import Book
 
@@ -1527,7 +1527,7 @@ Document definition
     )
 
     @INDEX.doc_type
-    class BookDocument(DocType):
+    class BookDocument(Document):
         """Book Elasticsearch document."""
         # ID
         id = fields.IntegerField(attr='id')
@@ -1608,7 +1608,7 @@ Document definition
         class Meta(object):
             """Meta options."""
 
-            model = Book  # The model associate with this DocType
+            model = Book  # The model associate with this Document
 
 ViewSet definition
 ^^^^^^^^^^^^^^^^^^
@@ -2022,7 +2022,7 @@ The following example indicates Ngram analyzer/filter usage.
 .. code-block:: python
 
     from django.conf import settings
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
 
     from elasticsearch_dsl import analyzer
     from elasticsearch_dsl.analysis import token_filter
@@ -2052,7 +2052,7 @@ The following example indicates Ngram analyzer/filter usage.
     )
 
     @INDEX.doc_type
-    class BookDocument(DocType):
+    class BookDocument(Document):
         """Book Elasticsearch document."""
 
         # In different parts of the code different fields are used. There are
@@ -2083,7 +2083,7 @@ The following example indicates Ngram analyzer/filter usage.
         class Meta(object):
             """Meta options."""
 
-            model = Book  # The model associate with this DocType
+            model = Book  # The model associate with this Document
 
 ViewSet definition
 ~~~~~~~~~~~~~~~~~~

docs/basic_usage_examples.rst

@@ -77,7 +77,7 @@ Sample document
 
 .. code-block:: python
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from elasticsearch_dsl import analyzer
 
     from books.models import Publisher
@@ -92,7 +92,7 @@ Sample document
 
 
     @PUBLISHER_INDEX.doc_type
-    class PublisherDocument(DocType):
+    class PublisherDocument(Document):
         """Publisher Elasticsearch document."""
 
         id = fields.IntegerField(attr='id')
@@ -135,7 +135,7 @@ Sample document
         class Meta(object):
             """Meta options."""
 
-            model = Publisher  # The model associate with this DocType
+            model = Publisher  # The model associate with this Document
 
 
 Sample serializer

docs/indexing_troubleshooting.rst

@@ -94,7 +94,7 @@ document meta.
 
 .. code-block:: python
 
-    class LocationDocument(DocType):
+    class LocationDocument(Document):
 
         # ...
 
@@ -116,7 +116,7 @@ wish to index them by chunks of 20 thousands at once, specify the
 
 .. code-block:: python
 
-    class LocationDocument(DocType):
+    class LocationDocument(Document):
 
         # ...
 
@@ -153,7 +153,7 @@ settings (as already has been mentioned above).
 
     # ...
 
-    class LocationDocument(DocType):
+    class LocationDocument(Document):
 
         # ...
 

docs/more_like_this.rst

@@ -12,7 +12,7 @@ Sample document
 
     from django.conf import settings
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from django_elasticsearch_dsl_drf.compat import KeywordField, StringField
     from django_elasticsearch_dsl_drf.analyzers import edge_ngram_completion
 
@@ -31,7 +31,7 @@ Sample document
 
 
     @INDEX.doc_type
-    class BookDocument(DocType):
+    class BookDocument(Document):
 
         # ID
         id = fields.IntegerField(attr='id')
@@ -69,7 +69,7 @@ Sample document
         class Meta(object):
             """Meta options."""
 
-            model = Book  # The model associate with this DocType
+            model = Book  # The model associate with this Document
 
         def prepare_summary(self, instance):
             """Prepare summary."""

docs/nested_fields_usage_examples.rst

@@ -335,7 +335,7 @@ Document index
 
     from django.conf import settings
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from django_elasticsearch_dsl_drf.compat import KeywordField, StringField
 
     from books.models import Address
@@ -352,7 +352,7 @@ Document index
     )
 
     @INDEX.doc_type
-    class AddressDocument(DocType):
+    class AddressDocument(Document):
         """Address Elasticsearch document."""
 
         # In different parts of the code different fields are used. There are
@@ -484,7 +484,7 @@ Document index
         class Meta(object):
             """Meta options."""
 
-            model = Address  # The model associate with this DocType
+            model = Address  # The model associate with this Document
 
 Sample serializer
 -----------------
@@ -765,7 +765,7 @@ Sample document
 
     from django.conf import settings
 
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from django_elasticsearch_dsl_drf.compat import KeywordField, StringField
 
     from books.models import City
@@ -782,7 +782,7 @@ Sample document
 
 
     @INDEX.doc_type
-    class CityDocument(DocType):
+    class CityDocument(Document):
         """City Elasticsearch document.
 
         This document has been created purely for testing out complex fields.
@@ -847,7 +847,7 @@ Sample document
         class Meta(object):
             """Meta options."""
 
-            model = City  # The model associate with this DocType
+            model = City  # The model associate with this Document
 
 Sample view
 +++++++++++

docs/quick_start.rst

@@ -393,7 +393,7 @@ Required imports
 .. code-block:: python
 
     from django.conf import settings
-    from django_elasticsearch_dsl import DocType, Index, fields
+    from django_elasticsearch_dsl import Document, Index, fields
     from elasticsearch_dsl import analyzer
 
     from books.models import Book
@@ -488,7 +488,7 @@ Document definition
 .. code-block:: python
 
     @INDEX.doc_type
-    class BookDocument(DocType):
+    class BookDocument(Document):
         """Book Elasticsearch document."""
 
         id = fields.IntegerField(attr='id')
@@ -557,7 +557,7 @@ Document definition
         class Meta(object):
             """Meta options."""
 
-            model = Book  # The model associate with this DocType
+            model = Book  # The model associate with this Document
 
 Syncing Django's database with Elasticsearch indexes
 ----------------------------------------------------
@@ -1081,7 +1081,7 @@ Change your development settings in the following way:
 
 .. code-block:: python
 
-    MIDDLEWARE_CLASSES += (
+    MIDDLEWARE += (
         'debug_toolbar.middleware.DebugToolbarMiddleware',
         'debug_toolbar_force.middleware.ForceDebugToolbarMiddleware',
     )