diff --git a/.github/workflows/test_djelme.yml b/.github/workflows/test_djelme.yml index d4f7841..874c51f 100644 --- a/.github/workflows/test_djelme.yml +++ b/.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 }} diff --git a/elasticsearch_metrics/apps.py b/elasticsearch_metrics/apps.py index 52128f2..7de9f29 100644 --- a/elasticsearch_metrics/apps.py +++ b/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 diff --git a/elasticsearch_metrics/field.py b/elasticsearch_metrics/field.py index 14e25a5..228fe0a 100644 --- a/elasticsearch_metrics/field.py +++ b/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 diff --git a/elasticsearch_metrics/metrics.py b/elasticsearch_metrics/metrics.py index ed1221a..5d0251c 100644 --- a/elasticsearch_metrics/metrics.py +++ b/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 diff --git a/setup.py b/setup.py index 596035a..263aa37 100644 --- a/setup.py +++ b/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", diff --git a/tests/conftest.py b/tests/conftest.py index ea95af8..71af551 100644 --- a/tests/conftest.py +++ b/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") diff --git a/tests/test_metrics.py b/tests/test_metrics.py index 8fe1ed4..5601c76 100644 --- a/tests/test_metrics.py +++ b/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,