Skip to content

Search: update to ES 7.x #7582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 7, 2020
Merged

Search: update to ES 7.x #7582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ jobs:
- image: 'cimg/python:3.6'
environment:
TOX_POSARGS: ''
- image: 'docker.elastic.co/elasticsearch/elasticsearch:6.8.12'
- image: 'docker.elastic.co/elasticsearch/elasticsearch:7.9.2'
name: search
environment:
discovery.type: single-node
steps:
- checkout
- run: git submodule sync
Expand Down
2 changes: 1 addition & 1 deletion readthedocs/search/faceted_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def total_count(self):
# we are only interested in the total count
s = s.extra(size=0)
s = s.execute()
return s.hits.total
return s.hits.total['value']

def query(self, search, query):
"""
Expand Down
6 changes: 3 additions & 3 deletions requirements/pip.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ django-allauth==0.42.0 # pyup: ignore
GitPython==3.1.11

# Search
elasticsearch==6.8.1 # pyup: <7.0.0
elasticsearch-dsl==6.4.0 # pyup: <7.0
django-elasticsearch-dsl==6.4.2 # pyup: <7.0
elasticsearch==7.9.1 # pyup: <8.0.0
elasticsearch-dsl==7.3.0 # pyup: <8.0
django-elasticsearch-dsl==7.1.4 # pyup: <8.0
selectolax==0.2.9

# NOTE: this dep can be removed in python 3.7 in favor of ``date.fromisoformat``
Expand Down