Skip to content

Commit 5ea0ed1

Browse files
committed
chore: bump djelme dependency
1 parent 4649800 commit 5ea0ed1

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

osf/metrics/metric_mixin.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ def _get_id_to_count(cls, size, metric_field, count_field, after=None, before=No
7777
# indices, determined from `after`
7878
@classmethod
7979
def search(cls, using=None, index=None, after=None, before=None, *args, **kwargs):
80-
# if not index and (before or after):
81-
# indices = cls._get_relevant_indices(after, before)
82-
# index = ','.join(indices)
80+
if not index and (before or after):
81+
indices = cls._get_relevant_indices(after, before)
82+
index = ','.join(indices)
8383
return super().search(using=using, index=index, *args, **kwargs)
8484

8585
@classmethod

osf_tests/management_commands/test_reindex_es6.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
AuthUserFactory
1111
)
1212

13-
from elasticsearch_metrics.field import Keyword
13+
from elasticsearch6_dsl import Keyword
1414

1515
from tests.json_api_test_app import JSONAPITestApp
1616

poetry.lock

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ datacite = "1.1.3"
9191
rdflib = "7.0.0"
9292
colorlog = "6.8.2"
9393
# Metrics
94-
django-elasticsearch-metrics = {git ="https://github.com/CenterForOpenScience/django-elasticsearch-metrics.git", rev = "7a7f664469070dd52dc4d9401f6b6d2d9fe7ddf0"} # branch is feature/pin-esdsl
94+
django-elasticsearch-metrics = {git ="https://github.com/CenterForOpenScience/django-elasticsearch-metrics.git", rev = "bb1c84c148ac1d2b1079b2b113e52a01a861c8a6"}
9595
# Impact Metrics CSV Export
9696
djangorestframework-csv = "3.0.2"
9797
gevent = "24.2.1"

0 commit comments

Comments
 (0)