jsonschemas: update licenses schema fields

* Close #22
inveniosoftware · Feb 7, 2018 · 8f8fe63 · 8f8fe63
1 parent 0de19e8
commit 8f8fe63
Show file tree

Hide file tree

Showing 5 changed files with 1,240 additions and 1,224 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,25 +38,28 @@ cache:
 services:
   - mysql
   - postgresql
-  - elasticsearch
 
 env:
-  - REQUIREMENTS=lowest EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db"
-  - REQUIREMENTS=lowest EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio"
-  - REQUIREMENTS=lowest EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
-  - REQUIREMENTS=release EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db"
-  - REQUIREMENTS=release EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio"
-  - REQUIREMENTS=release E2E_WEBDRIVER_BROWSERS="Firefox" EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
-  - REQUIREMENTS=devel EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db"
-  - REQUIREMENTS=devel EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio"
-  - REQUIREMENTS=devel EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio"
+  - REQUIREMENTS=lowest EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db" ES_VERSION=2.2.0
+  - REQUIREMENTS=lowest EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_VERSION=2.2.0
+  - REQUIREMENTS=lowest EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_VERSION=2.2.0
+  - REQUIREMENTS=release EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db" ES_VERSION=2.2.0
+  - REQUIREMENTS=release EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_VERSION=2.2.0
+  - REQUIREMENTS=release E2E_WEBDRIVER_BROWSERS="Firefox" EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_VERSION=2.2.0
+  - REQUIREMENTS=devel EXTRAS=all,sqlite SQLALCHEMY_DATABASE_URI="sqlite:///test.db" ES_VERSION=2.2.0
+  - REQUIREMENTS=devel EXTRAS=all,mysql SQLALCHEMY_DATABASE_URI="mysql+pymysql://travis@localhost:3306/invenio" ES_VERSION=2.2.0
+  - REQUIREMENTS=devel EXTRAS=all,postgresql SQLALCHEMY_DATABASE_URI="postgresql+psycopg2://postgres@localhost:5432/invenio" ES_VERSION=2.2.0
 
 
 python:
   - "2.7"
   - "3.5"
 
 before_install:
+  - "mkdir /tmp/elasticsearch"
+  - "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"
+  - "/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 --level=min setup.py > .travis-lowest-requirements.txt"

diff --git a/invenio_opendefinition/jsonschemas/licenses/license-v1.0.0.json b/invenio_opendefinition/jsonschemas/licenses/license-v1.0.0.json
@@ -39,6 +39,9 @@
     "maintainer": {
       "type": "string"
     },
+    "legacy_ids" : {
+      "type": "array"
+    },
     "od_conformance": {
       "$ref": "#/definitions/conformance"
     },

diff --git a/invenio_opendefinition/mappings/licenses/license-v1.0.0.json b/invenio_opendefinition/mappings/licenses/license-v1.0.0.json
@@ -26,6 +26,10 @@
         "maintainer": {
           "type": "string"
         },
+        "legacy_ids" : {
+          "type": "string",
+          "index": "not_analyzed"
+        },
         "od_conformance": {
           "type": "string",
           "index": "not_analyzed"

diff --git a/setup.py b/setup.py
@@ -40,21 +40,24 @@
     'pytest-cache>=1.0',
     'pytest-cov>=1.8.0',
     'pytest-pep8>=1.0.6',
-    'pytest>=2.8.0',
+    'pytest>=3.3.1',
 ]
 
+db_version = '>=1.0.0b9'
+
 extras_require = {
     'docs': [
         'Sphinx>=1.4.2',
     ],
-    'sqlite': [
-        'invenio-db>=1.0.0a9',
+    # Database version
+    'postgresql': [
+        'invenio-db[postgresql,versioning]{}'.format(db_version),
     ],
     'mysql': [
-        'invenio-db[mysql]>=1.0.0a9',
+        'invenio-db[mysql,versioning]{}'.format(db_version),
     ],
-    'postgresql': [
-        'invenio-db[postgresql]>=1.0.0a9',
+    'sqlite': [
+        'invenio-db[versioning]{}'.format(db_version),
     ],
     'tests': tests_require,
 }
@@ -78,7 +81,7 @@
     'invenio-pidstore>=1.0.0b1',
     'invenio-records>=1.0.0b1',
     'invenio-records-rest>=1.0.0a18',
-    'invenio-search>=1.0.0a9',
+    'invenio-search==1.0.0b1',  # support to ES 5/6 not tested
     'jsonref>=0.1',
     'jsonresolver>=0.2.1',
     'jsonschema>=2.5.1',