feat: add support for support for Python/Django (#460)

Co-authored-by: Safwan Rahman <[email protected]>

Author: irtazaakram

.github/workflows/ci.yml

@@ -7,104 +7,36 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     strategy:
       fail-fast: false
 
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
-        django-version: ["1.11", "2.0", "2.2", "2.1", "3.0", "3.1","3.2", "4.0", "4.1",]
+        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        django-version: ["3.2", "4.1", "4.2"]
         es-dsl-version: ["6.4", "7.4"]
         es-version: ["7.13.4"]
 
         exclude:
-          - python-version: "2.7"
-            django-version: "2.0"
-          - python-version: "2.7"
-            django-version: "2.1"
-          - python-version: "2.7"
-            django-version: "2.2"
-          - python-version: "2.7"
-            django-version: "3.0"
-          - python-version: "2.7"
-            django-version: "3.1"
-          - python-version: "2.7"
-            django-version: "3.2"
-          - python-version: "2.7"
-            django-version: "4.0"
-          - python-version: "2.7"
-            django-version: "4.1"
-
-          - python-version: "3.6"
-            django-version: "4.0"
-          - python-version: "3.6"
-            django-version: "4.1"
-
-          - python-version: "3.7"
-            django-version: "4.0"
-          - python-version: "3.7"
-            django-version: "4.1"
-
-          - python-version: "3.8"
-            django-version: "1.11"
-          - python-version: "3.8"
-            django-version: "2.0"
-          - python-version: "3.8"
-            django-version: "2.1"
-
-          - python-version: "3.9"
-            django-version: "1.11"
-          - python-version: "3.9"
-            django-version: "2.0"
-          - python-version: "3.9"
-            django-version: "2.1"
-
-          - python-version: "3.10"
-            django-version: "1.11"
-          - python-version: "3.10"
-            django-version: "2.0"
-          - python-version: "3.10"
-            django-version: "2.1"
-          - python-version: "3.10"
-            django-version: "2.2"
-          - python-version: "3.10"
-            django-version: "3.0"
-          - python-version: "3.10"
-            django-version: "3.1"
-
-          - python-version: "3.11"
-            django-version: "1.11"
-          - python-version: "3.11"
-            django-version: "2.0"
-          - python-version: "3.11"
-            django-version: "2.1"
-          - python-version: "3.11"
-            django-version: "2.2"
-          - python-version: "3.11"
-            django-version: "3.0"
-          - python-version: "3.11"
-            django-version: "3.1"
           - python-version: "3.11"
             django-version: "3.2"
-          - python-version: "3.11"
-            django-version: "4.0"
 
     steps:
       - name: Install and Run Elasticsearch
         uses: elastic/elastic-github-actions/elasticsearch@master
         with:
           stack-version: ${{ matrix.es-version }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Install Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
       - name: Cache Pip Dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('requirements_test.txt') }}
@@ -125,4 +57,4 @@ jobs:
           python -m tox -e $TOX_ENV -- --elasticsearch --signal-processor celery
 
       - name: Publish Coverage Report
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3

README.rst

@@ -30,8 +30,8 @@ Features
 - Index fast using `parallel` indexing.
 - Requirements
 
-   - Django >= 1.11
-   - Python 2.7, 3.5, 3.6, 3.7, 3.8
+   - Django >= 3.2
+   - Python 3.8, 3.9, 3.10, 3.11
 
 **Elasticsearch Compatibility:**
 The library is compatible with all Elasticsearch versions since 5.x
@@ -41,8 +41,6 @@ The library is compatible with all Elasticsearch versions since 5.x
 
 - For Elasticsearch 6.0 and later, use the major version 6 (6.x.y) of the library.
 
-- For Elasticsearch 5.0 and later, use the major version 0.5 (0.5.x) of the library.
-
 .. code-block:: python
 
     # Elasticsearch 7.x
@@ -51,7 +49,4 @@ The library is compatible with all Elasticsearch versions since 5.x
     # Elasticsearch 6.x
     elasticsearch-dsl>=6.0.0,<7.0.0
 
-    # Elasticsearch 5.x
-    elasticsearch-dsl>=0.5.1,<6.0.0
-
 .. _Search: http://elasticsearch-dsl.readthedocs.io/en/stable/search_dsl.html

django_elasticsearch_dsl/__init__.py

@@ -13,5 +13,3 @@ def autodiscover():
     autodiscover_modules('documents')
 
 
-if django.VERSION < (3, 2):
-    default_app_config = 'django_elasticsearch_dsl.apps.DEDConfig'

requirements.txt

@@ -1,2 +1,2 @@
-django>=1.9.6
+django>=3.2
 elasticsearch-dsl>=7.0.0,<8.0.0

requirements_dev.txt

@@ -1,6 +1,6 @@
-bumpversion==0.5.3
-wheel==0.32.2
-django>=2.0,<2.2
+bumpversion==0.6.0
+wheel==0.41.2
+django>=3.2
 elasticsearch-dsl>=7.0.0,<8.0.0
 twine
 sphinx

requirements_test.txt

@@ -1,9 +1,8 @@
-coverage==4.1
+coverage==7.3.1
 mock>=1.0.1
 flake8>=2.1.0
 tox>=1.7.0
-Pillow==6.2.0
+Pillow==10.0.0
 celery>=4.1.0
 
-
 # Additional test requirements go here

setup.py

@@ -51,26 +51,17 @@
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Framework :: Django',
-        'Framework :: Django :: 1.11',
-        'Framework :: Django :: 2.0',
-        'Framework :: Django :: 2.1',
-        'Framework :: Django :: 2.2',
-        'Framework :: Django :: 3.0',
-        'Framework :: Django :: 3.1',
         'Framework :: Django :: 3.2',
-        'Framework :: Django :: 4.0',
+        'Framework :: Django :: 4.1',
+        'Framework :: Django :: 4.2',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Natural Language :: English',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
     ],
     extras_require={
         'celery':  ["celery>=4.1.0"],

tox.ini

@@ -1,31 +1,23 @@
 [tox]
 envlist =
-    py27-django-111-es74
-    {py36,py37,py38,py39,py310,py311}-django-{111,20,21,22,30,31,32,40,41}-{es64,es74}
+    py{38,39,310}-django-{32,41,42}-{es64,es74}
+    py{311}-django-{41,42}-{es64,es74}
+
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}:{toxinidir}/django_elasticsearch_dsl
 commands = coverage run --source django_elasticsearch_dsl runtests.py {posargs}
 
 deps =
-    django-111: Django>=1.11,<2.0
-    django-20: 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
-    django-31: Django>=3.1,<3.2
     django-32: Django>=3.2,<3.3
-    django-40: Django>=4.0,<4.1
     django-41: Django>=4.1,<4.2
+    django-42: Django>=4.2,<4.3
     es64: elasticsearch-dsl>=6.4.0,<7.0.0
     es74: elasticsearch-dsl>=7.4.0,<8
     -r{toxinidir}/requirements_test.txt
 
 basepython =
-    py27: python2.7
-    py36: python3.6
-    py37: python3.7
     py38: python3.8
     py39: python3.9
     py310: python3.10