Switch to elasticsearch-py as dsl has been merged into it

Author: violuke

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         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-py-version: ["9.0"]
         es-version: ["8.10.2"]
 
         exclude:
@@ -47,12 +47,12 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install "Django==${{ matrix.django-version }}"
-          python -m pip install "elasticsearch-dsl==${{ matrix.es-dsl-version }}"
+          python -m pip install "elasticsearch==${{ matrix.es-py-version }}"
           python -m pip install -r requirements_test.txt
 
-      - name: Run tests with Python ${{ matrix.python-version }} and Django ${{ matrix.django-version }} and elasticsearch-dsl-py ${{ matrix.es-dsl-version }}
+      - name: Run tests with Python ${{ matrix.python-version }} and Django ${{ matrix.django-version }} and elasticsearch-py ${{ matrix.es-py-version }}
         run: |
-          TOX_ENV=$(echo "py${{ matrix.python-version }}-django-${{ matrix.django-version }}-es${{ matrix.es-dsl-version }}" | tr -d .)
+          TOX_ENV=$(echo "py${{ matrix.python-version }}-django-${{ matrix.django-version }}-es${{ matrix.es-py-version }}" | tr -d .)
           python -m tox -e $TOX_ENV -- --elasticsearch
           python -m tox -e $TOX_ENV -- --elasticsearch --signal-processor celery
 

README.rst

@@ -12,8 +12,8 @@ Django Elasticsearch DSL
     :target: https://django-elasticsearch-dsl.readthedocs.io/en/latest/
 
 Django Elasticsearch DSL is a package that allows indexing of django models in elasticsearch.
-It is built as a thin wrapper around elasticsearch-dsl-py_
-so you can use all the features developed by the elasticsearch-dsl-py team.
+It is built as a thin wrapper around elasticsearch-py_
+so you can use all the features developed by the elasticsearch-py team.
 
 You can view the full documentation at https://django-elasticsearch-dsl.readthedocs.io
 

requirements.txt

@@ -1,2 +1,2 @@
 django>=3.2
-elasticsearch-dsl>=8.0.0,<9.0.0
+elasticsearch>=9.0.0,<10.0.0

requirements_dev.txt

@@ -1,7 +1,7 @@
 bumpversion==0.6.0
 wheel==0.41.2
 django>=3.2
-elasticsearch-dsl>=7.0.0,<8.0.0
+elasticsearch>=9.0.0,<10.0.0
 twine
 sphinx
 -e .

setup.py

@@ -43,7 +43,7 @@
     ],
     include_package_data=True,
     install_requires=[
-        'elasticsearch-dsl>=8.9.0,<9.0.0',
+        'elasticsearch>=9.0.0,<10.0.0',
         'six',
     ],
     license="Apache Software License 2.0",

tox.ini

@@ -13,8 +13,7 @@ deps =
     django-32: Django>=3.2,<3.3
     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
+    es9: elasticsearch>=9.0.0,<10
     -r{toxinidir}/requirements_test.txt
 
 basepython =