global: add support for ES7 #31
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slint
reviewed
Aug 7, 2019
.travis.yml
Outdated
| - "wget -O - https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${ES_VERSION}/elasticsearch-${ES_VERSION}.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1" | ||
| - "/tmp/elasticsearch/bin/plugin install -b mapper-attachments" | ||
| - "wget -O - $ES_URL | tar xz --directory=/tmp/elasticsearch --strip-components=1" | ||
| - "if [ ${ES_URL} == ${ES2_DOWNLOAD_URL} ]; then /tmp/elasticsearch/bin/plugin install -b mapper-attachments; fi" |
There was a problem hiding this comment.
Not needed, since full-text file indexing is not part of invenio-record-files anymore
setup.py
Outdated
| @@ -28,6 +28,8 @@ | |||
|
|
|||
| db_version = '>=1.0.0' | |||
|
|
|||
| invenio_search_version = '1.0.0' | |||
setup.py
Outdated
| 'tests': tests_require, | ||
| } | ||
|
|
||
| extras_require['all'] = [] | ||
| for name, reqs in extras_require.items(): | ||
| if name in ('mysql', 'postgresql', 'sqlite'): | ||
| if name in ( | ||
| 'mysql', 'postgresql', 'sqlite', |
There was a problem hiding this comment.
These three can be removed as well
tests/test_rest.py
Outdated
|
|
||
| if ES_VERSION[0] == 2: | ||
| assert len(options) == 2 | ||
| assert {(o['payload']['id'], o['text']) for o in options} == { |
There was a problem hiding this comment.
Actually, invenio-records-rest makes sure _source is always there with these keys (i.e. the same case as below for ES_VERSION[0] > 2). I think we can keep the _source version of the tests (since ES2 will be removed soon)
tests/test_rest.py
Outdated
| elif ES_VERSION[0] > 2: | ||
| assert len(options) == 1 | ||
| assert { | ||
| (o['_source']['id'], |
There was a problem hiding this comment.
I think this is the same test as above
Co-Authored-By: Glignos <glignos93@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.