archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Upgraded ElasticSearch to 6.1.x.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2018-01-11 10:29:15 +01:00
parent ca3d99c52c
commit 68b6e43649
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pillar/api/search/documents.py
View File

@ -36,14 +36,14 @@ class User(es.DocType):
objectID = es.Keyword() objectID = es.Keyword()
username = es.String(fielddata=True, analyzer=autocomplete) username = es.Text(fielddata=True, analyzer=autocomplete)
username_exact = es.Keyword() 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) roles = es.Keyword(multi=True)
groups = 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() email_exact = es.Keyword()
class Meta: class Meta:
@ -59,37 +59,37 @@ class Node(es.DocType):
objectID = es.Keyword() objectID = es.Keyword()
name = es.String( name = es.Text(
fielddata=True, fielddata=True,
analyzer=autocomplete analyzer=autocomplete
) )
user = es.Object({ user = es.Object(
'fields': { fields={
'id': es.Keyword(), 'id': es.Keyword(),
'name': es.String( 'name': es.Text(
fielddata=True, fielddata=True,
analyzer=autocomplete) analyzer=autocomplete)
} }
}) )
description = es.String() description = es.Text()
is_free = es.Boolean() is_free = es.Boolean()
project = es.Object({ project = es.Object(
'fields': { fields={
'id': es.Keyword(), 'id': es.Keyword(),
'name': es.Keyword(), 'name': es.Keyword(),
} }
}) )
media = es.Keyword() media = es.Keyword()
picture = es.Keyword() picture = es.Keyword()
tags = es.Keyword(multi=True) tags = es.Keyword(multi=True)
license_notes = es.String() license_notes = es.Text()
created_at = es.Date() created_at = es.Date()
updated_at = es.Date() updated_at = es.Date()

4
requirements.txt
View File

@ -8,8 +8,8 @@ blinker==1.4
bleach==1.4.3 bleach==1.4.3
celery[redis]==4.0.2 celery[redis]==4.0.2
CommonMark==0.7.2 CommonMark==0.7.2
elasticsearch==6.0.0 elasticsearch==6.1.1
elasticsearch-dsl==5.4.0 elasticsearch-dsl==6.1.0
Eve==0.7.3 Eve==0.7.3
Flask==0.12 Flask==0.12
Flask-Babel==0.11.2 Flask-Babel==0.11.2

5
setup.py
View File

@ -41,6 +41,11 @@ setuptools.setup(
'Flask-OAuthlib>=0.9.3', 'Flask-OAuthlib>=0.9.3',
'Flask-WTF>=0.12', 'Flask-WTF>=0.12',
'algoliasearch>=1.12.0', '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', 'attrs>=16.2.0',
'bugsnag>=2.3.1', 'bugsnag>=2.3.1',
'gcloud>=0.12.0', 'gcloud>=0.12.0',