global: various fixes

Signed-off-by: Pamfilos Fokianos <pamfilosf@gmail.com>
cernanalysispreservation · Oct 1, 2024 · 064601e · 064601e
1 parent 7834150
commit 064601e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/cap/modules/deposit/validators/__init__.py b/cap/modules/deposit/validators/__init__.py
@@ -28,7 +28,8 @@
 
 from flask import current_app
 from jsonschema._types import draft7_type_checker
-from jsonschema._utils import load_schema
+# from jsonschema._utils import load_schema
+from jsonschema_specifications import REGISTRY as SPECIFICATIONS
 from jsonschema.validators import Draft7Validator, create, extend
 
 from cap.modules.deposit.validators.services import fetch_data_from_url
@@ -75,7 +76,9 @@
 }
 
 MinimalValidator = create(
-    load_schema('draft7'),
+    SPECIFICATIONS.contents(
+        "http://json-schema.org/draft-07/schema#",
+    ),
     validators=minimal_validators,
     type_checker=draft7_type_checker,
     version="draft7-clean",

diff --git a/cap/modules/mail/cli.py b/cap/modules/mail/cli.py
@@ -25,7 +25,7 @@
 
 import click
 from flask import current_app
-from flask_cli import with_appcontext
+from flask.cli import with_appcontext
 from flask_mail import Message
 
 from cap.cli import MutuallyExclusiveOption

diff --git a/requirements-local-forks.txt b/requirements-local-forks.txt
@@ -5,8 +5,8 @@
 -e git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new#egg=invenio-indexer
 -e git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1#egg=invenio-jsonschemas
 -e git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new#egg=invenio-oaiserver
--e git+https://github.com/parths007/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
--e git+https://github.com/parths007/invenio-search.git@v1.2.3#egg=invenio-search[opensearch2]
+-e git+https://github.com/cernanalysispreservation/invenio-records-rest.git@os-2-new#egg=invenio-records-rest
+-e git+https://github.com/cernanalysispreservation/invenio-search.git@v1.2.3#egg=invenio-search[opensearch2]
 -e git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest
 -e git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files
 -e git+https://github.com/cernanalysispreservation/invenio-deposit.git@os-2#egg=invenio-deposit

diff --git a/setup.py b/setup.py
@@ -80,13 +80,14 @@
     'requests-gssapi>=1.2.3',
     'swagger-spec-validator==2.7.6',
     'prometheus-flask-exporter==0.20.3',
-    # 'suds==1.1.2',
+    'suds==1.1.2',
     'wtforms==2.2.1',
     'beautifulsoup4>=4',
     'pandas>=1.5',
     'marshmallow==2.17.0',
-    # 'reana-client==*',
-    # 'reana-commons[yadage,snakemake]==*',
+    'reana-client==0.9.3',
+    'reana-commons[yadage,snakemake]',
+    'jsonschema-specifications',
 
     # Invenio Base Deps
     'invenio-base==1.2.5',
@@ -109,16 +110,16 @@
     # Invenio Metadata Deps
     'invenio-indexer @ git+https://github.com/cernanalysispreservation/invenio-indexer.git@os-2-new',
     'invenio-jsonschemas @ git+https://github.com/cernanalysispreservation/invenio-jsonschemas.git@v1.0.1',
-    'invenio-oaiserver @ git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new',
+    'invenio-oaiserver@git+https://github.com/cernanalysispreservation/invenio-oaiserver.git@os-2-new',
     'invenio-pidstore==1.1.0',
-    'invenio-records-rest @ git+https://github.com/cernanalysispreservation/invenio-records-rest.git@os-2-new',
+    'invenio-records-rest@git+https://github.com/cernanalysispreservation/invenio-records-rest.git@os-2-new#egg=invenio-records-rest',
     'invenio-records-ui==1.0.1',
     'invenio-records==1.3.0',
     'invenio-search-ui==1.1.1',
-    'invenio-search @ git+https://github.com/cernanalysispreservation/invenio-search.git@v1.2.3#egg=invenio-search',
+    'invenio-search @ git+https://github.com/cernanalysispreservation/invenio-search.git@mock/v1.2.3#egg=invenio-search[opensearch2]',
 
     # Invenio Files deps
-    'invenio-files-rest @ git+https://github.com/cernanalysispreservation/invenio-files-rest.git@v1.0.5',
+    'invenio-files-rest @ git+https://github.com/cernanalysispreservation/invenio-files-rest.git@mock/v1.0.5#egg=invenio-files-rest',
     'invenio-records-files @ git+https://github.com/cernanalysispreservation/invenio-records-files.git@new#egg=invenio-records-files',
 
     # Database deps