Merge b4459e2 into 77af5e2

rero · Dec 18, 2019 · a36609a · a36609a
2 parents 77af5e2 + b4459e2
commit a36609a
Show file tree

Hide file tree

Showing 49 changed files with 2,571 additions and 258 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -109,3 +109,5 @@ recursive-include data *.crt
 recursive-include sonar *.babelrc
 recursive-include sonar *.eslintignore
 recursive-include tests *.json
+
+recursive-include sonar *.txt
diff --git a/Pipfile b/Pipfile
@@ -18,6 +18,7 @@ python-slugify = "*"
 python3-saml = "*"
 xmltodict = "*"
 marshmallow = "<=3.0.0b6"
+pycountry = "*"
 
 [dev-packages]
 Flask-Debugtoolbar = ">=0.10.1"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/data/users.json b/data/users.json
@@ -1,7 +1,6 @@
 [
   {
-    "first_name": "Jorg",
-    "last_name": "Mueller",
+    "full_name": "Jorg Mueller",
     "email": "rero.sonar+superadmin@gmail.com",
     "password": "123456",
     "roles": ["superadmin"],
@@ -12,8 +11,7 @@
     "phone": "+41916658961"
   },
   {
-    "first_name": "Elia",
-    "last_name": "Rossi",
+    "full_name": "Elia Rossi",
     "email": "rero.sonar+admin@gmail.com",
     "password": "123456",
     "roles": ["admin"],
@@ -27,8 +25,7 @@
     }
   },
   {
-    "first_name": "Emanuele",
-    "last_name": "Fiorentini",
+    "full_name": "Emanuele Fiorentini",
     "email": "rero.sonar+moderator@gmail.com",
     "password": "123456",
     "roles": ["moderator"],
@@ -42,8 +39,7 @@
     }
   },
   {
-    "first_name": "Jules",
-    "last_name": "Brochu",
+    "full_name": "Jules Brochu",
     "email": "rero.sonar+user@gmail.com",
     "password": "123456",
     "roles": ["user"],

diff --git a/docker-services.yml b/docker-services.yml
@@ -82,6 +82,9 @@ services:
       memlock:
         soft: -1
         hard: -1
+      nofile:
+        soft: 65536
+        hard: 65536
     mem_limit: 1g
     ports:
       - "9200:9200"
@@ -91,7 +94,7 @@ services:
     environment:
       - "ELASTICSEARCH_HOSTS=http://es:9200"
       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-    ports: 
+    ports:
       - "5601:5601"
   flower:
     image: mher/flower

diff --git a/setup.py b/setup.py
@@ -64,7 +64,8 @@
         ],
         'invenio_base.api_blueprints': [
             'sonar = sonar.theme.api_views:blueprint',
-            'pdf_extractor = sonar.modules.pdf_extractor.views.api:blueprint'
+            'pdf_extractor = sonar.modules.pdf_extractor.views.api:blueprint',
+            'deposits = sonar.modules.deposits.rest:blueprint'
         ],
         'invenio_assets.webpack': [
             'sonar_theme = sonar.theme.webpack:theme'
@@ -92,31 +93,38 @@
         'invenio_jsonschemas.schemas': [
             'documents = sonar.modules.documents.jsonschemas',
             'institutions = sonar.modules.institutions.jsonschemas',
-            'users = sonar.modules.users.jsonschemas'
+            'users = sonar.modules.users.jsonschemas',
+            'deposits = sonar.modules.deposits.jsonschemas'
         ],
         'invenio_search.mappings': [
             'documents = sonar.modules.documents.mappings',
             'institutions = sonar.modules.institutions.mappings',
-            'users = sonar.modules.users.mappings'
+            'users = sonar.modules.users.mappings',
+            'deposits = sonar.modules.deposits.mappings'
         ],
         'invenio_pidstore.minters': [
             'document_id = \
                 sonar.modules.documents.api:document_pid_minter',
             'institution_id = \
                 sonar.modules.institutions.api:institution_pid_minter',
             'user_id = \
-                sonar.modules.users.api:user_pid_minter'
+                sonar.modules.users.api:user_pid_minter',
+            'deposit_id = \
+                sonar.modules.deposits.api:deposit_pid_minter'
         ],
         'invenio_pidstore.fetchers': [
             'document_id = \
                 sonar.modules.documents.api:document_pid_fetcher',
             'institution_id = \
                 sonar.modules.institutions.api:institution_pid_fetcher',
             'user_id = \
-                sonar.modules.users.api:user_pid_fetcher'
+                sonar.modules.users.api:user_pid_fetcher',
+            'deposit_id = \
+                sonar.modules.deposits.api:deposit_pid_fetcher'
         ],
         "invenio_records.jsonresolver": [
-            "institution = sonar.modules.institutions.jsonresolvers"
+            "institution = sonar.modules.institutions.jsonresolvers",
+            "user = sonar.modules.users.jsonresolvers"
         ]
     },
     classifiers=[