Adds support for elasticsearch 5

OneGov · Mar 14, 2017 · 28a9f64 · 28a9f64
1 parent 87cd792
commit 28a9f64
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ env:
     - TOXENV=py35 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.2.2.tar.gz
     - TOXENV=py34 DEPLOY=yes ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.3.tar.gz
     - TOXENV=py35 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-2.4.3.tar.gz
+    - TOXENV=py34 DEPLOY=yes ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-5.2.2.tar.gz
+    - TOXENV=py35 DEPLOY=no ES_BINARY=/tmp/elasticsearch/bin/elasticsearch ES_URL=https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch-5.2.2.tar.gz
     - TOXENV=pep8 ES_URL=no DEPLOY=no
 
 install: ./.travis-install.sh

diff --git a/onegov/search/dsl.py b/onegov/search/dsl.py
@@ -1,8 +1,6 @@
 from elasticsearch_dsl import Search as BaseSearch
-from elasticsearch_dsl.result import (
-    Response as BaseResponse,
-    Result as BaseResult
-)
+from elasticsearch_dsl.result import Result as BaseResult
+from elasticsearch_dsl.response import Response as BaseResponse
 
 
 class Search(BaseSearch):

diff --git a/onegov/search/indexer.py b/onegov/search/indexer.py
@@ -339,7 +339,7 @@ def query_aliases(self):
 
         result = set()
 
-        infos = self.es_client.indices.get_aliases(
+        infos = self.es_client.indices.get_alias(
             '{}-*'.format(self.normalized_hostname))
 
         for info in infos.values():

diff --git a/onegov/search/integration.py b/onegov/search/integration.py
@@ -129,7 +129,7 @@ def es_search(self, languages='*', types='*', include_private=False,
 
         # by default, do not include any fields (this will still include
         # the id and the type, which is enough for the orm querying)
-        search = search.fields([])
+        search = search.source(exclude=['*'])
 
         return search
 

diff --git a/setup.py b/setup.py
@@ -33,8 +33,8 @@ def get_long_description():
     platforms='any',
     install_requires=[
         'certifi',
-        'elasticsearch>=2.2.0,<3.0.0',
-        'elasticsearch-dsl>=2.0.0,<3.0.0',
+        'elasticsearch>=5.0.0,<6.0.0',
+        'elasticsearch-dsl>=5.0.0,<6.0.0',
         'onegov.core>=0.22.0',
         'webtest'
     ],