Merge b9a3739 into b91347b

.travis.yml

@@ -18,17 +18,17 @@ cache:
 
 env:
   global:
-    - ES2_DOWNLOAD_URL="https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.4.2/elasticsearch-2.4.2.tar.gz"
-    - ES5_DOWNLOAD_URL="https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-5.6.4.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:
-    - REQUIREMENTS=lowest EXTRAS=all,elasticsearch2 ES_URL=$ES2_DOWNLOAD_URL
-    # TODO: Add when `invenio-search v1.0.0b3` starts being propagated as a minimum requirement
-    # - REQUIREMENTS=lowest EXTRAS=all,elasticsearch5 ES_URL=$ES5_DOWNLOAD_URL
-    - REQUIREMENTS=release EXTRAS=all,elasticsearch5 ES_URL=$ES5_DOWNLOAD_URL DEPLOY=true
+    - REQUIREMENTS=lowest EXTRAS=all,elasticsearch5 ES_URL=$ES5_DOWNLOAD_URL
+    - REQUIREMENTS=lowest EXTRAS=all,elasticsearch6 ES_URL=$ES6_DOWNLOAD_URL
     - REQUIREMENTS=release EXTRAS=all,elasticsearch6 ES_URL=$ES6_DOWNLOAD_URL
+    - REQUIREMENTS=release EXTRAS=all,elasticsearch7 ES_URL=$ES7_DOWNLOAD_URL DEPLOY=true
     - REQUIREMENTS=devel EXTRAS=all,elasticsearch6 ES_URL=$ES6_DOWNLOAD_URL
+    - REQUIREMENTS=devel EXTRAS=all,elasticsearch7 ES_URL=$ES7_DOWNLOAD_URL
 
 python:
   - "2.7"
@@ -37,15 +37,14 @@ python:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: REQUIREMENTS=devel EXTRAS=all,elasticsearch2 ES_URL=$ES2_DOWNLOAD_URL
-    - env: REQUIREMENTS=devel EXTRAS=all,elasticsearch5 ES_URL=$ES5_DOWNLOAD_URL
+    - env: REQUIREMENTS=devel EXTRAS=all,elasticsearch6 ES_URL=$ES6_DOWNLOAD_URL
+    - env: REQUIREMENTS=devel EXTRAS=all,elasticsearch7 ES_URL=$ES7_DOWNLOAD_URL
 
 before_install:
   - "nvm install 6; nvm use 6"
   - "mkdir /tmp/elasticsearch"
   - "wget -O - ${ES_URL} | tar xz --directory=/tmp/elasticsearch --strip-components=1"
-  - "/tmp/elasticsearch/bin/elasticsearch &"
-  - "sleep 20"
+  - "/tmp/elasticsearch/bin/elasticsearch > /tmp/local-es.log &"
   - "travis_retry pip install --upgrade pip setuptools py"
   - "travis_retry pip install twine wheel coveralls requirements-builder"
   - "requirements-builder -e $EXTRAS --level=min setup.py > .travis-lowest-requirements.txt"
@@ -56,12 +55,15 @@ install:
   - "travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt"
   - "travis_retry pip install -e .[${EXTRAS}]"
 
+before_script:
+  # Allow ES to start
+  - sleep 5
+  - curl http://127.0.0.1:9200 && echo "Elasticsearch is up!" || cat /tmp/local-es.log
+
 script:
   - "./run-tests.sh"
 
 after_success:
-  - /tmp/elasticsearch/bin/elasticsearch --version
-  - wget -q --waitretry=1 --retry-connrefused -T 10 -O - http://127.0.0.1:9200
   - coveralls
 
 deploy:
@@ -71,6 +73,7 @@ deploy:
     secure: "rBB4WpQDeWqt9xyqXENI/VodBLgOnuPuXIURSBvT+CItWe7dvjGqbWJAbMTZgemaDA9RxQfyIFnFTUkE62AnttxHW39n6UiG+lZgNNdZot8SxYzV6Lza9CdBGMEXwJ9FSf8mer9GIgfO993muKNztt4eFx3aob19Eia2Ob5sgq88Vu7ROxL2+XqM4HT36uh/Q84zcMobYbd5ToM14QNfg65/gtT26hh42KHhCSbS2JZjrudQcM7LCcZWXDs48+dTk4KuAUCUhsbIXlGc1mrxttswocPyk9V0Yhp34JHPqZVAyBI3mtnjKJ6zQB3LpCKuI4hmpv/i8kbay96f7Y49pT7FVXbV+byglyXXrFLHa+/VxkSBpSTyaQjXmctAdvajQjwYN2nKCQXngTAd8O4dgg6xq6e8z5WNFVJAsR5CQ/nYquSQgNamaB6dTEr2sZRrP6KnftzI/uYY9h762qOhkcomNmz9hvw2/yQSTc2xItsdtROsbR4zf5+N2J3vbh3Fr1K/PDkQRdHBTxBs/J3irqps7s2Fl7Sd1O093Y1CZK2Qhyge3poL3JRdDwKjTKqNW2BK+UuUJBzPgwI9t82vIPqTLOkm1bRcmESuh3UMb+sRiZGyNsINKin6htsDIFZDKMs5poeIQq4vm2kKM4GD1zni+cTrGs72/CpTL1zBQuo="
   on:
     tags: true
+    python: "3.5"
     distributions: compile_catalog sdist bdist_wheel
     repo: inveniosoftware/invenio-marc21
     condition: $DEPLOY = true

CHANGES.rst

@@ -1,13 +1,13 @@
 ..
     This file is part of Invenio.
-    Copyright (C) 2016-2018 CERN.
+    Copyright (C) 2016-2019 CERN.
 
     Invenio is free software; you can redistribute it and/or modify it
     under the terms of the MIT License; see LICENSE file for more details.
 
 Changes
 =======
 
-Version 1.0.0 (released 2018-03-23)
+Version 1.0.0 (released 2018-07-19)
 
 - Initial public release.

docs/conf.py

@@ -316,9 +316,12 @@
 # Example configuration for intersphinx: refer to the Python standard library.
 intersphinx_mapping = {
     'https://docs.python.org/': None,
-    'flask': ('http://flask.pocoo.org/docs/0.11', None),
-    'invenio-pidstore': ('http://pythonhosted.org/invenio-pidstore', None),
-    'invenio-records': ('http://pythonhosted.org/invenio-records', None),
+    'flask': (
+        'http://flask.pocoo.org/docs/', None),
+    'invenio-pidstore': (
+        'https://invenio-pidstore.readthedocs.io/en/latest/', None),
+    'invenio-records': (
+        'https://invenio-records.readthedocs.io/en/latest/', None),
 }
 
 # Autodoc configuraton.

invenio_marc21/mappings/v7/__init__.py

@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2016-2018 CERN.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+"""Invenio module with nice defaults for MARC21 overlay."""