global: add ES7 support

Closes #3953
inveniosoftware · Jul 30, 2019 · df0136f · df0136f
1 parent f36efbc
commit df0136f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,18 +27,21 @@ cache:
 
 env:
   global:
-    - ES5_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.15.tar.gz"
-    - ES6_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.2.2.tar.gz"
+    - ES5_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.16.tar.gz"
+    - ES6_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-6.8.1.tar.gz"
+    - ES7_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.2.0-linux-x86_64.tar.gz"
     - ES_HOST=127.0.0.1
   matrix:
     # ES5 + MySQL
     - REQUIREMENTS=lowest EXTRAS=all,mysql,elasticsearch5 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES5_DOWNLOAD_URL
-    # ES5 + PostgreSQL
-    - REQUIREMENTS=release EXTRAS=all,postgresql,elasticsearch5 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES5_DOWNLOAD_URL DEPLOY=true
     # ES6 + MySQL
     - REQUIREMENTS=release EXTRAS=all,mysql,elasticsearch6 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES6_DOWNLOAD_URL
     # ES6 + PostgreSQL
     - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch6 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES6_DOWNLOAD_URL
+    # ES7 + MySQL
+    - REQUIREMENTS=release EXTRAS=all,mysql,elasticsearch7 SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_URL=$ES7_DOWNLOAD_URL
+    # ES7 + PostgreSQL
+    - REQUIREMENTS=devel EXTRAS=all,postgresql,elasticsearch7 SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_URL=$ES7_DOWNLOAD_URL
 
 python:
   - "2.7"

diff --git a/docs/architecture/infrastructure.rst b/docs/architecture/infrastructure.rst
@@ -20,7 +20,7 @@ infrastructure. It consists of:
 - **Application servers:** UWSGI, Gunicorn or mod_wsgi.
 - **Distributed task queue:** Celery
 - **Database:** PostgreSQL, MySQL or SQLite.
-- **Search engine:** Elasticsearch (v5 and v6).
+- **Search engine:** Elasticsearch (v6 and v7).
 - **Message queue:** RabbitMQ, Redis or Amazon SQS.
 - **Cache system:** Redis or Memcache.
 - **Storage system:** Local, S3, XRootD, WebDAV and more.

diff --git a/docs/conf.py b/docs/conf.py
@@ -327,7 +327,7 @@
     'flaskscript': ('https://flask-script.readthedocs.io/en/latest/', None),
     'invenio-access': (
         'https://invenio-access.readthedocs.io/en/latest/', None),
-    'jinja': ('http://jinja.pocoo.org/docs/', None),
+    'jinja': ('https://jinja.readthedocs.io/en/2.10.x/', None),
     'python': ('https://docs.python.org/2.7/', None),
     'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None),
     'webassets': ('https://webassets.readthedocs.io/en/latest/', None),

diff --git a/docs/general/requirements.rst b/docs/general/requirements.rst
@@ -19,7 +19,7 @@ Following is a brief overview of the requirements of Invenio:
 - Supported databases:
     - PostgreSQL v9.4+, MySQL 5.6+ or SQLite (for testing).
 - Supported search engines:
-    - Elasticsearch v5 or v6.
+    - Elasticsearch v6 or v7.
 - Supported memory caches:
     - Redis or Memcache.
 - Supported message queues:

diff --git a/setup.py b/setup.py
@@ -88,6 +88,9 @@
     'elasticsearch6': [
         'invenio-search[elasticsearch6]{}'.format(search_version),
     ],
+    'elasticsearch7': [
+        'invenio-search[elasticsearch7]{}'.format(search_version),
+    ],
     # Docs and test dependencies
     'docs': [
         'Sphinx>=1.5.1',