diff --git a/pillar/api/search/documents.py b/pillar/api/search/documents.py index b0063b33..653b8e95 100644 --- a/pillar/api/search/documents.py +++ b/pillar/api/search/documents.py @@ -36,14 +36,14 @@ class User(es.DocType): objectID = es.Keyword() - username = es.String(fielddata=True, analyzer=autocomplete) + username = es.Text(fielddata=True, analyzer=autocomplete) username_exact = es.Keyword() - full_name = es.String(fielddata=True, analyzer=autocomplete) + full_name = es.Text(fielddata=True, analyzer=autocomplete) roles = es.Keyword(multi=True) groups = es.Keyword(multi=True) - email = es.String(fielddata=True, analyzer=autocomplete) + email = es.Text(fielddata=True, analyzer=autocomplete) email_exact = es.Keyword() class Meta: @@ -59,37 +59,37 @@ class Node(es.DocType): objectID = es.Keyword() - name = es.String( + name = es.Text( fielddata=True, analyzer=autocomplete ) - user = es.Object({ - 'fields': { + user = es.Object( + fields={ 'id': es.Keyword(), - 'name': es.String( + 'name': es.Text( fielddata=True, analyzer=autocomplete) } - }) + ) - description = es.String() + description = es.Text() is_free = es.Boolean() - project = es.Object({ - 'fields': { + project = es.Object( + fields={ 'id': es.Keyword(), 'name': es.Keyword(), } - }) + ) media = es.Keyword() picture = es.Keyword() tags = es.Keyword(multi=True) - license_notes = es.String() + license_notes = es.Text() created_at = es.Date() updated_at = es.Date() diff --git a/requirements.txt b/requirements.txt index e9b400e0..90e21060 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,8 +8,8 @@ blinker==1.4 bleach==1.4.3 celery[redis]==4.0.2 CommonMark==0.7.2 -elasticsearch==6.0.0 -elasticsearch-dsl==5.4.0 +elasticsearch==6.1.1 +elasticsearch-dsl==6.1.0 Eve==0.7.3 Flask==0.12 Flask-Babel==0.11.2 diff --git a/setup.py b/setup.py index 10a7891c..1d1014ea 100644 --- a/setup.py +++ b/setup.py @@ -41,6 +41,11 @@ setuptools.setup( 'Flask-OAuthlib>=0.9.3', 'Flask-WTF>=0.12', 'algoliasearch>=1.12.0', + + # Limit the major version to the major version of ElasticSearch we're using. + 'elasticsearch>=6.0.0,<7.0.0', + 'elasticsearch_dsl>=6.0.0,<7.0.0', + 'attrs>=16.2.0', 'bugsnag>=2.3.1', 'gcloud>=0.12.0',