[WIP] prefer elasticsearch6-dsl to elasticsearch-dsl

.github/workflows/test_djelme.yml

@@ -10,10 +10,10 @@ permissions:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         id: setup-py
         with:
           python-version: '3.7'
@@ -36,15 +36,15 @@ jobs:
           - {python: '3.7', django: '4.1'}
           - {python: '3.10', django: '1.11'}
           - {python: '3.10', django: '2.0'}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     services:
       elasticsearch:
         image: elasticsearch:6.8.23
         ports:
           - 9201:9200
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         id: setup-py
         with:
           python-version: ${{ matrix.python }}

elasticsearch_metrics/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 from django.conf import settings
-from elasticsearch_dsl.connections import connections
+from elasticsearch6_dsl.connections import connections
 from django.utils.module_loading import autodiscover_modules
 
 

elasticsearch_metrics/field.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from elasticsearch_dsl import field as edsl_field
+from elasticsearch6_dsl import field as edsl_field
 
 __all__ = ["Date"]
 # Expose all fields from elasticsearch_dsl.field

elasticsearch_metrics/metrics.py

@@ -4,10 +4,10 @@
 from django.apps import apps
 from django.conf import settings
 from django.utils import timezone
-from elasticsearch.exceptions import NotFoundError
-from elasticsearch_dsl import Document, connections
-from elasticsearch_dsl.document import IndexMeta, MetaField
-from elasticsearch_dsl.index import Index
+from elasticsearch6.exceptions import NotFoundError
+from elasticsearch6_dsl import Document, connections
+from elasticsearch6_dsl.document import IndexMeta, MetaField
+from elasticsearch6_dsl.index import Index
 
 from elasticsearch_metrics import signals
 from elasticsearch_metrics import exceptions

setup.py

@@ -60,7 +60,7 @@ def read(fname):
         "metrics",
         "statistics",
     ),
-    install_requires=["elasticsearch-dsl>=6.3.0,<7.0.0"],
+    install_requires=["elasticsearch6-dsl>=6.3.0,<7.0.0"],
     extras_require=EXTRAS_REQUIRE,
     classifiers=[
         "Operating System :: OS Independent",

tests/conftest.py

@@ -1,7 +1,7 @@
 import mock
 import pytest
 
-from elasticsearch_dsl import connections
+from elasticsearch6_dsl import connections
 
 
 @pytest.fixture(scope="function")

tests/test_metrics.py

@@ -3,7 +3,7 @@
 import datetime as dt
 from django.utils import timezone
 from elasticsearch_metrics import metrics
-from elasticsearch_dsl import (
+from elasticsearch6_dsl import (
     IndexTemplate,
     analyzer,
     tokenizer,