installation: use git dependency for invenio-swh

zenodo · Nov 30, 2023 · 3826f91 · 3826f91
1 parent 1f4e4a8
commit 3826f91
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/Pipfile b/Pipfile
@@ -14,6 +14,8 @@ invenio-app-rdm = {version = "~=12.0.0b2.dev3", extras = ["opensearch2"]}
 invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
 zenodo_rdm = {editable="True", path="./site"}
 zenodo_legacy = {editable="True", path="./legacy"}
+# TODO: Remove once we fix PyPI package issues
+invenio-swh = {git = "https://github.com/inveniosoftware/invenio-swh", ref = "v0.2.1"}
 jsonschema = ">=4.17.0,<4.18.0" # due to compatibility issues with alpha
 ipython = "!=8.1.0"
 uwsgi = ">=2.0"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/site/setup.cfg b/site/setup.cfg
@@ -23,7 +23,8 @@ install_requires =
     nameparser>=1.1.1
     pyinstrument>=4.5.1
     sqltap>=0.3.11
-    invenio_swh>=0.20.0,<1.0.0
+    # TODO: Add once we fix PyPI package issues
+    # invenio-swh>=0.2.0,<1.0.0
 
 [options.extras_require]
 tests =

diff --git a/site/zenodo_rdm/custom_fields.py b/site/zenodo_rdm/custom_fields.py
@@ -117,7 +117,7 @@ def field(self):
     "obo": "http://purl.obolibrary.org/obo/",
     "dc": "http://purl.org/dc/terms/",
     "legacy": "",
-    **CODEMETA_NAMESPACE, # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
+    **CODEMETA_NAMESPACE,  # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
     **JOURNAL_NAMESPACE,
     **MEETING_NAMESPACE,
     **IMPRINT_NAMESPACE,
@@ -182,7 +182,7 @@ def field(self):
     # obo
     RelationshipListCF(name="obo:RO_0002453"),
     # codemeta,
-    *CODEMETA_CUSTOM_FIELDS, # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
+    *CODEMETA_CUSTOM_FIELDS,  # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
     # journal
     *JOURNAL_CUSTOM_FIELDS,
     # meeting
@@ -522,7 +522,7 @@ def field(self):
     # zenodo custom fields
     ZENODO_CUSTOM_FIELDS_UI,
     # codemeta
-    CODEMETA_CUSTOM_FIELDS_UI, # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
+    CODEMETA_CUSTOM_FIELDS_UI,  # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
     # publishing information
     {
         "section": _("Publishing information"),
@@ -543,5 +543,5 @@ def field(self):
 # Custom fields facets
 
 CUSTOM_FIELDS_FACETS = {
-    **CODEMETA_FACETS, # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
+    **CODEMETA_FACETS,  # TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
 }
diff --git a/site/zenodo_rdm/utils.py b/site/zenodo_rdm/utils.py
@@ -12,11 +12,10 @@
 import idutils
 from flask import current_app, url_for
 from invenio_app_rdm.records_ui.utils import dump_external_resource
+from invenio_i18n import _
 from invenio_rdm_records.proxies import current_rdm_records_service as service
 from invenio_swh.proxies import current_swh_service as service_swh
 
-from invenio_i18n import _
-
 from zenodo_rdm.openaire.utils import openaire_link
 
 
@@ -137,7 +136,6 @@ def openaire_link_render(record):
 
 def swh_link_render(record):
     """Render the swh link."""
-
     if not current_app.config.get("SWH_ENABLED"):
         return None