Added support for Django 3.0. (django-es#230)

Author: noamkush

.travis.yml

@@ -7,12 +7,6 @@ dist: xenial # default "precise" distro doesn't include Java 8 for Elasticsearch
 
 matrix:
   include:
-    - env: TOX_ENV=py36-django-110-es6
-      python: 3.6
-    - env: TOX_ENV=py37-django-110-es6
-      python: 3.7
-    - env: TOX_ENV=py27-django-110-es6
-      python: 2.7
     - env: TOX_ENV=py36-django-111-es6
       python: 3.6
     - env: TOX_ENV=py37-django-111-es6
@@ -27,6 +21,8 @@ matrix:
       python: 3.7
     - env: TOX_ENV=py37-django-22-es6
       python: 3.7
+    - env: TOX_ENV=py37-django-30-es6
+      python: 3.7
 
 cache: pip
 env:

README.rst

@@ -29,7 +29,7 @@ Features
 - Complex field type support (ObjectField, NestedField).
 - Requirements
 
-   - Django >= 1.10
+   - Django >= 1.11
    - Python 2.7, 3.5, 3.6, 3.7
 
 **Elasticsearch Compatibility:**

django_elasticsearch_dsl/documents.py

@@ -1,14 +1,13 @@
 from __future__ import unicode_literals
 
 from collections import deque
-from copy import deepcopy
 from functools import partial
 
 from django import VERSION as DJANGO_VERSION
 from django.db import models
-from django.utils.six import iteritems
 from elasticsearch.helpers import bulk, parallel_bulk
 from elasticsearch_dsl import Document as DSLDocument
+from six import iteritems
 
 from .exceptions import ModelFieldNotMappedError
 from .fields import (

django_elasticsearch_dsl/indices.py

@@ -1,7 +1,7 @@
 from copy import deepcopy
 
-from django.utils.encoding import python_2_unicode_compatible
 from elasticsearch_dsl import Index as DSLIndex
+from six import python_2_unicode_compatible
 
 from .apps import DEDConfig
 from .registries import registry

django_elasticsearch_dsl/management/commands/search_index.py

@@ -2,7 +2,7 @@
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from django.utils.six.moves import input
+from six.moves import input
 from ...registries import registry
 
 

django_elasticsearch_dsl/registries.py

@@ -5,8 +5,8 @@
 
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.six import itervalues, iterkeys, iteritems
 from elasticsearch_dsl import Field, AttrDict
+from six import itervalues, iterkeys, iteritems
 
 from django_elasticsearch_dsl.exceptions import RedeclaredFieldError
 from .apps import DEDConfig

example/test_app/models.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from django.utils.encoding import python_2_unicode_compatible
 from django.db import models
+from six import python_2_unicode_compatible
 
 
 @python_2_unicode_compatible

setup.py

@@ -43,17 +43,19 @@
     include_package_data=True,
     install_requires=[
         'elasticsearch-dsl>=7.0.0<8.0.0',
+        'six',
     ],
     license="Apache Software License 2.0",
     zip_safe=False,
     keywords='django elasticsearch elasticsearch-dsl',
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 1.10',
         'Framework :: Django :: 1.11',
         'Framework :: Django :: 2.0',
         'Framework :: Django :: 2.1',
+        'Framework :: Django :: 2.2',
+        'Framework :: Django :: 3.0',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',

tests/models.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
+from six import python_2_unicode_compatible
 
 
 @python_2_unicode_compatible

tests/test_commands.py

@@ -3,7 +3,7 @@
 
 from django.core.management.base import CommandError
 from django.core.management import call_command
-from django.utils.six import StringIO
+from six import StringIO
 
 from django_elasticsearch_dsl import Index
 from django_elasticsearch_dsl.management.commands.search_index import Command

tests/test_fields.py

@@ -1,9 +1,9 @@
 from unittest import TestCase
 
 from django.db.models.fields.files import FieldFile
-from django.utils.six import string_types
 from django.utils.translation import ugettext_lazy as _
 from mock import Mock, NonCallableMock
+from six import string_types
 
 from django_elasticsearch_dsl.exceptions import VariableLookupError
 from django_elasticsearch_dsl.fields import (

tests/test_integration.py

@@ -4,8 +4,8 @@
 
 from django.core.management import call_command
 from django.test import TestCase
-from django.utils.six import StringIO
 from django.utils.translation import ugettext_lazy as _
+from six import StringIO
 
 from elasticsearch_dsl import Index as DSLIndex
 from django_elasticsearch_dsl.test import ESTestCase

tox.ini

@@ -1,10 +1,7 @@
 [tox]
 envlist =
-    {py27,py36,py37}-django-110-{es7}
-    {py27,py36,py37}-django-111-{es7}
-    {py36,py37}-django-2-{es7}
-    {py36,py37}-django-21-{es7}
-    {py36,py37}-django-22-{es7}
+    py27-django-111-es7
+    {py36,py37}-django-{111,2,21,22,30}-{es7}
 
 [testenv]
 setenv =
@@ -13,11 +10,11 @@ commands = python runtests.py {posargs}
 
 
 deps =
-    django-110: Django>=1.10,<1.11
     django-111: Django>=1.11,<2.0
     django-2: Django>=2.0,<2.1
     django-21: Django>=2.1,<2.2
     django-22: Django>=2.2,<2.3
+    django-30: Django>=3.0,<3.1
     es6: elasticsearch-dsl>=6.4.0,<7.0.0
     es7: elasticsearch-dsl>=7,<8
     -r{toxinidir}/requirements_test.txt