From 2bfcad79f2d24bc0c83e21b2768a242a726bf92c Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Fri, 23 Feb 2024 13:07:08 -0500 Subject: [PATCH 1/5] run on ubuntu20, there's no py3.6 on ubuntu22 --- .github/workflows/test_djelme.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_djelme.yml b/.github/workflows/test_djelme.yml index d4f7841..b25465e 100644 --- a/.github/workflows/test_djelme.yml +++ b/.github/workflows/test_djelme.yml @@ -10,7 +10,7 @@ permissions: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 @@ -36,7 +36,7 @@ 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 From 6449d24a7c51259e70a975a940b7569775cf86a9 Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Fri, 23 Feb 2024 14:49:15 -0500 Subject: [PATCH 2/5] bump github action versions --- .github/workflows/test_djelme.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_djelme.yml b/.github/workflows/test_djelme.yml index b25465e..874c51f 100644 --- a/.github/workflows/test_djelme.yml +++ b/.github/workflows/test_djelme.yml @@ -12,8 +12,8 @@ jobs: lint: 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' @@ -43,8 +43,8 @@ jobs: 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 }} From 7e936cbc93ba3827486752ac74da2a412a53f93a Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Wed, 21 Feb 2024 15:18:39 -0500 Subject: [PATCH 3/5] swap es-dsl dep to es6-dsl --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 36f5ff8188f976b4bb915cff2f77a635f6dab95c Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Thu, 22 Feb 2024 05:38:42 -0500 Subject: [PATCH 4/5] update imports to follow --- elasticsearch_metrics/apps.py | 2 +- elasticsearch_metrics/field.py | 2 +- elasticsearch_metrics/metrics.py | 6 +++--- tests/conftest.py | 2 +- tests/test_metrics.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) 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..242eb19 100644 --- a/elasticsearch_metrics/metrics.py +++ b/elasticsearch_metrics/metrics.py @@ -5,9 +5,9 @@ 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_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/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, From f5b9312914154e213aa01731e934c593e3434269 Mon Sep 17 00:00:00 2001 From: Fitz Elliott Date: Fri, 23 Feb 2024 13:14:16 -0500 Subject: [PATCH 5/5] convert import es to import es6 --- elasticsearch_metrics/metrics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch_metrics/metrics.py b/elasticsearch_metrics/metrics.py index 242eb19..5d0251c 100644 --- a/elasticsearch_metrics/metrics.py +++ b/elasticsearch_metrics/metrics.py @@ -4,7 +4,7 @@ from django.apps import apps from django.conf import settings from django.utils import timezone -from elasticsearch.exceptions import NotFoundError +from elasticsearch6.exceptions import NotFoundError from elasticsearch6_dsl import Document, connections from elasticsearch6_dsl.document import IndexMeta, MetaField from elasticsearch6_dsl.index import Index