Skip to content

Commit 28ab451

Browse files
committed
installation: update invenio packages
1 parent cb78c56 commit 28ab451

File tree

6 files changed

+892
-1176
lines changed

6 files changed

+892
-1176
lines changed

Pipfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ invenio-logging = {extras = ["sentry_sdk"], version = "~=2.0"}
1515
zenodo_rdm = {editable="True", path="./site"}
1616
zenodo_legacy = {editable="True", path="./legacy"}
1717
# TODO: Remove once we fix PyPI package issues
18-
invenio-swh = {git = "https://github.com/inveniosoftware/invenio-swh", ref = "v0.2.2"}
18+
invenio-swh = {git = "https://github.com/inveniosoftware/invenio-swh", ref = "v0.3.0"}
19+
commonmeta-py = ">=0.8.4,<0.8.6"
1920
jsonschema = ">=4.17.0,<4.18.0" # due to compatibility issues with alpha
2021
ipython = "!=8.1.0"
2122
uwsgi = ">=2.0"

Pipfile.lock

+868-1,152
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

site/zenodo_rdm/custom_fields/__init__.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,12 @@
3434
THESIS_NAMESPACE,
3535
)
3636

37-
from .domain_fields import BIODIV_FIELDS, AUDIOVIS_FIELDS,\
38-
BIODIVERSITY_FIELDS_UI, AUDIOVIS_FIELDS_UI
37+
from .domain_fields import (
38+
AUDIOVIS_FIELDS,
39+
AUDIOVIS_FIELDS_UI,
40+
BIODIV_FIELDS,
41+
BIODIVERSITY_FIELDS_UI,
42+
)
3943
from .legacy import LEGACY_CUSTOM_FIELDS
4044
from .publishing import PUBLISHING_FIELDS_UI
4145

@@ -58,7 +62,6 @@
5862
CUSTOM_FIELDS = [
5963
*BIODIV_FIELDS,
6064
*AUDIOVIS_FIELDS,
61-
6265
# codemeta,
6366
*CODEMETA_CUSTOM_FIELDS,
6467
# TODO enable when fixed (see https://github.com/zenodo/rdm-project/issues/217)
@@ -75,7 +78,6 @@
7578
]
7679

7780

78-
7981
# hide meeting section from Additional details in landing page
8082
MEETING_CUSTOM_FIELDS_UI["hide_from_landing_page"] = True
8183

site/zenodo_rdm/custom_fields/legacy.py

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
# under the terms of the MIT License; see LICENSE file for more details.
77

88
"""Custom fields."""
9-
from invenio_records_resources.services.custom_fields import (
10-
BaseCF,
11-
KeywordCF,
12-
)
9+
from invenio_records_resources.services.custom_fields import BaseCF, KeywordCF
1310
from marshmallow import fields
1411
from marshmallow_utils.fields import SanitizedUnicode
1512

@@ -47,4 +44,4 @@ def field(self):
4744
KeywordCF(name="legacy:communities", multiple=True),
4845
SubjectListCF(name="legacy:subjects"),
4946
]
50-
"""Legacy compatibility custom fields."""
47+
"""Legacy compatibility custom fields."""

site/zenodo_rdm/custom_fields/publishing.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
)
2525

2626
PUBLISHING_FIELDS_UI = {
27-
"section": _("Publishing information"),
28-
"hide_from_landing_page": True, # hide meeting section from Additional details in landing page
29-
"fields": [
30-
# journal
31-
*JOURNAL_CUSTOM_FIELDS_UI["fields"],
32-
# imprint
33-
*IMPRINT_CUSTOM_FIELDS_UI["fields"],
34-
# thesis
35-
*THESIS_CUSTOM_FIELDS_UI["fields"],
36-
],
37-
}
27+
"section": _("Publishing information"),
28+
"hide_from_landing_page": True, # hide meeting section from Additional details in landing page
29+
"fields": [
30+
# journal
31+
*JOURNAL_CUSTOM_FIELDS_UI["fields"],
32+
# imprint
33+
*IMPRINT_CUSTOM_FIELDS_UI["fields"],
34+
# thesis
35+
*THESIS_CUSTOM_FIELDS_UI["fields"],
36+
],
37+
}

site/zenodo_rdm/legacy/serializers/schemas/legacyjson.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,9 @@ def dump_files(self, obj):
142142
file_id = f["id"]
143143
if files_url:
144144
links = {"self": f"{files_url}/{file_id}"}
145-
links[
146-
"download"
147-
] = f"{current_app.config['SITE_API_URL']}/records/{obj['id']}/draft/files/{key}/content"
145+
links["download"] = (
146+
f"{current_app.config['SITE_API_URL']}/records/{obj['id']}/draft/files/{key}/content"
147+
)
148148
result.append(
149149
{
150150
"id": f["id"],

0 commit comments

Comments
 (0)