installation: invenio package upgrades

biotrainee · Dec 22, 2017 · deea7d3 · deea7d3
1 parent c77162d
commit deea7d3
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -86,7 +86,7 @@ before_install:
 install:
   - "cat .travis-${REQUIREMENTS}-requirements.txt"
   - "travis_retry pip install -r .travis-${REQUIREMENTS}-requirements.txt --pre"
-  - "travis_retry pip install -e .[all,postgresql] --pre"
+  - "travis_retry pip install -e .[all,postgresql,elasticsearch2] --pre"
   - pip freeze
   - "./scripts/setup-assets.sh"
 

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -147,7 +147,7 @@ Next, install Zenodo and code the dependencies:
 
     (zenodo)$ cd ~/src/zenodo
     (zenodo)$ pip install -r requirements.txt --src ~/src/ --pre --upgrade
-    (zenodo)$ pip install -e .[all,postgresql]
+    (zenodo)$ pip install -e .[all,postgresql,elasticsearch2]
 
 .. note::
 
@@ -156,11 +156,11 @@ Next, install Zenodo and code the dependencies:
 
 .. note::
 
-    Z shell users: wrap the ``.[all,postgresql]`` part in quotes:
+    Z shell users: wrap the ``.[all,postgresql,elasticsearch2]`` part in quotes:
 
     .. code-block:: console
 
-        (zenodo)$ pip install -e ".[all,postgresql]"
+        (zenodo)$ pip install -e ".[all,postgresql,elasticsearch2]"
 
 Media assets
 ~~~~~~~~~~~~

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,2 +1,2 @@
 -r requirements.txt
--e .[all,sqlite]
+-e .[all,sqlite,elasticsearch2]
diff --git a/requirements.txt b/requirements.txt
@@ -94,34 +94,34 @@ github3.py==1.0.0a4
 html5lib==1.0b10
 humanize==0.5.1
 idna==2.6
-IDUtils==0.2.4
+IDUtils==1.0.0
 infinity==1.4
 intervals==0.8.0
 invenio-access==1.0.0b1
 invenio-accounts==1.0.0b12
 invenio-admin==1.0.0b4
-invenio-app==1.0.0b1
+invenio-app==1.0.0b2
 invenio-assets==1.0.0b7
-invenio-base==1.0.0a16
+invenio-base==1.0.0b1
 invenio-cache==1.0.0b1
 invenio-celery==1.0.0b3
 invenio-communities==1.0.0a18
 invenio-config==1.0.0b3
 invenio-csl-rest==1.0.0a1
-invenio-db==1.0.0b8
-invenio-deposit==1.0.0a8
+invenio-db==1.0.0b9
+invenio-deposit==1.0.0a9
 invenio-files-rest==1.0.0a21
 invenio-formatter==1.0.0b3
 invenio-github==1.0.0a13
 invenio-i18n==1.0.0b4
-invenio-indexer==1.0.0a10
+invenio-indexer==1.0.0b1
 invenio-jsonschemas==1.0.0a7
 invenio-logging==1.0.0b3
 invenio-mail==1.0.0b1
-invenio-marc21==1.0.0a5
+invenio-marc21==1.0.0a6
 invenio-migrator==1.0.0a9
-invenio-oaiserver==1.0.0a14
-invenio-oauth2server==1.0.0b2
+invenio-oaiserver==1.0.0b1
+invenio-oauth2server==1.0.0b3
 invenio-oauthclient==1.0.0b3
 invenio-openaire==1.0.0a11
 invenio-opendefinition==1.0.0a4
@@ -131,10 +131,10 @@ invenio-previewer==1.0.0a11
 invenio-query-parser==0.6.0
 invenio-records==1.0.0b4
 invenio-records-files==1.0.0a9
-invenio-records-rest==1.0.0b3
-invenio-records-ui==1.0.0b1
+invenio-records-rest==1.0.0b5
+invenio-records-ui==1.0.0b2
 invenio-rest==1.0.0b2
-invenio-search==1.0.0b1
+invenio-search==1.0.0b4
 invenio-search-ui==1.0.0a9
 invenio-sipstore==1.0.0a7
 invenio-theme==1.0.0b4

diff --git a/setup.py b/setup.py
@@ -47,7 +47,8 @@
     'six>=1.10.0',
 ]
 
-db_version = '>=1.0.0b8'
+db_version = '>=1.0.0b9'
+search_version = '>=1.0.0b4'
 
 extras_require = {
     'docs': [
@@ -65,15 +66,21 @@
     ],
     # Elasticsearch version
     'elasticsearch2': [
-        'elasticsearch>=2.0.0,<3.0.0',
-        'elasticsearch-dsl>=2.0.0,<3.0.0',
+        'invenio-search[elasticsearch2]{}'.format(search_version),
     ],
+    # 'elasticsearch5': [
+    #     'invenio-search[elasticsearch5]{}'.format(search_version),
+    # ],
+    # 'elasticsearch6': [
+    #     'invenio-search[elasticsearch5]{}'.format(search_version),
+    # ],
     'tests': tests_require,
 }
 
 extras_require['all'] = []
 for name, reqs in extras_require.items():
-    if name in ('postgresql', 'mysql', 'sqlite'):
+    if name in ('postgresql', 'mysql', 'sqlite', 'elasticsearch2',
+                'elasticsearch5', 'elasticsearch6'):
         continue
     extras_require['all'].extend(reqs)
 
@@ -103,31 +110,31 @@
     'Flask-Caching>=1.3.2',
     'Flask-Debugtoolbar>=0.10.1',
     'ftfy>=4.4.3,<5',
-    'idutils>=0.2.4',
+    'idutils>=1.0.0',
     'invenio-access>=1.0.0b1',
     'invenio-accounts>=1.0.0b12',
     'invenio-admin>=1.0.0b4',
-    'invenio-app>=1.0.0b1',
+    'invenio-app>=1.0.0b2',
     'invenio-assets>=1.0.0b7',
-    'invenio-base>=1.0.0a16',
+    'invenio-base>=1.0.0b1',
     'invenio-cache>=1.0.0b1',
     'invenio-celery>=1.0.0b3',
     'invenio-communities>=1.0.0a18',
     'invenio-config>=1.0.0b3',
     'invenio-csl-rest>=1.0.0a1',
-    'invenio-deposit>=1.0.0a8',
+    'invenio-deposit>=1.0.0a9',
     'invenio-files-rest>=1.0.0a21',
     'invenio-formatter>=1.0.0b3',
     'invenio-github>=1.0.0a13',
     'invenio-i18n>=1.0.0b4',
-    'invenio-indexer>=1.0.0a10',
+    'invenio-indexer>=1.0.0b1',
     'invenio-jsonschemas>=1.0.0a7',
     'invenio-logging>=1.0.0b3',
     'invenio-mail>=1.0.0b1',
-    'invenio-marc21>=1.0.0a5',
+    'invenio-marc21>=1.0.0a6',
     'invenio-migrator>=1.0.0a9',
-    'invenio-oaiserver>=1.0.0a14',
-    'invenio-oauth2server>=1.0.0b2',
+    'invenio-oaiserver>=1.0.0b1',
+    'invenio-oauth2server>=1.0.0b3',
     'invenio-oauthclient[github]>=1.0.0b3',
     'invenio-openaire>=1.0.0a11',
     'invenio-opendefinition>=1.0.0a4',
@@ -136,18 +143,16 @@
     'invenio-previewer>=1.0.0a11',
     'invenio-records>=1.0.0b4',
     'invenio-records-files>=1.0.0a9',
-    'invenio-records-rest>=1.0.0b3',
-    'invenio-records-ui>=1.0.0a9',
+    'invenio-records-rest>=1.0.0b5',
+    'invenio-records-ui>=1.0.0b2',
     'invenio-rest[cors]>=1.0.0b2',
-    'invenio-search>=1.0.0b1',
     'invenio-search-ui>=1.0.0a9',
     'invenio-sipstore>=1.0.0a7',
     'invenio-theme>=1.0.0b4',
     'invenio-userprofiles>=1.0.0b2',
     'invenio-webhooks>=1.0.0a4',
     'jsonref>=0.1',
     'jsonresolver>=0.2.1',
-    'marshmallow==2.13.4',
     'mock>=2.0.0',
     'Pillow>=4.2.0',
     'pycountry>=17.5.14',

diff --git a/tests/unit/deposit/test_api_simpleflow.py b/tests/unit/deposit/test_api_simpleflow.py
@@ -314,7 +314,7 @@ def test_update_deposits_users(api, api_client, db, users, deposit,
     # admin user
     (dict(email='[email protected]', password='admin'), 204),
 ])
-def test_delete_deposits_users(api, api_client, db, users, deposit,
+def test_delete_deposits_users(api, api_client, db, es, users, deposit,
                                json_headers, user_info, status):
     """Test read deposit by users."""
     deposit_id = deposit['_deposit']['id']

diff --git a/zenodo/__init__.py b/zenodo/__init__.py
@@ -255,7 +255,7 @@
 
 .. code-block:: console
 
-   $ pip install -e .[postgresql,xrootd]
+   $ pip install -e .[postgresql,elasticsearch2,xrootd]
 
 Sentry
 ~~~~~~

diff --git a/zenodo/config.py b/zenodo/config.py
@@ -1008,6 +1008,14 @@ def _(x):
 SEARCH_DOC_TYPE_DEFAULT = None
 #: Do not map any keywords.
 SEARCH_ELASTIC_KEYWORD_MAPPING = {}
+#: Only create indexes we actually need.
+SEARCH_MAPPINGS = [
+    'deposits',
+    'funders',
+    'grants',
+    'licenses',
+    'records',
+]
 
 # Communities
 # ===========
-Original file line number
+Diff line change
@@ Expand Up / @@ -255,7 +255,7 @@ @@
     .. code-block:: console
-       $ pip install -e .[postgresql,xrootd]
+       $ pip install -e .[postgresql,elasticsearch2,xrootd]
     Sentry
     ~~~~~~
@@ Expand Down @@