invenio-vocabularies 3.4.1__tar.gz → 3.5.0__tar.gz

invenio_vocabularies-3.5.0/.github/workflows/pypi-publish.yml

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2020-2024 CERN.
+# Copyright (C) 2025 KTH Royal Institute of Technology.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+name: Publish
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  build-n-publish:
+    uses: inveniosoftware/workflows/.github/workflows/pypi-publish.yml@master
+    secrets: inherit
+    with:
+      babel-compile-catalog: true

invenio_vocabularies-3.5.0/.github/workflows/tests.yml

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of Invenio.
+# Copyright (C) 2020-2024 CERN.
+# Copyright (C) 2022 Graz University of Technology.
+#
+# Invenio is free software; you can redistribute it and/or modify it
+# under the terms of the MIT License; see LICENSE file for more details.
+
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+      - "feature/*"
+      - "maint-**"
+  pull_request:
+    branches:
+      - master
+      - "maint-**"
+      - "feature/*"
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron: "0 3 * * 6"
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: "Reason"
+        required: false
+        default: "Manual trigger"
+
+jobs:
+  Python:
+    uses: inveniosoftware/workflows/.github/workflows/tests-python.yml@master
+    with:
+      extras: "tests,oaipmh"
+
+  JS:
+    uses: inveniosoftware/workflows/.github/workflows/tests-js.yml@master
+    with:
+      js-working-directory: ./invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies
+      translations-working-directory: ./invenio_vocabularies/assets/semantic-ui/translations/invenio_vocabularies

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/CHANGES.rst

@@ -1,5 +1,6 @@
 ..
     Copyright (C) 2020-2024 CERN.
+    Copyright (C) 2025 KTH Royal Institute of Technology.
 
     Invenio-Vocabularies is free software; you can redistribute it and/or
     modify it under the terms of the MIT License; see LICENSE file for more
@@ -8,6 +9,19 @@
 Changes
 =======
 
+Version 3.5.0 (released 2025-04-30)
+
+- fix: setuptools require underscores instead of dashes
+- ci: use reusable workflows
+- i18n: push translations
+- i18n: pulled translations
+
+Version 3.4.2 (released 2025-03-21)
+
+- i18n: mark missing strings for translations
+- tests: remove unecessary "enzyme-to-json" package
+- CI: use reusable workflows
+
 Version 3.4.1 (released 2024-04-19)
 
 - funders: exclude ROR schema v2 json (#309)

invenio_vocabularies-3.5.0/PKG-INFO

@@ -0,0 +1,255 @@
+Metadata-Version: 2.4
+Name: invenio-vocabularies
+Version: 3.5.0
+Summary: "Invenio module for managing vocabularies."
+Home-page: https://github.com/inveniosoftware/invenio-vocabularies
+Author: CERN
+Author-email: info@inveniosoftware.org
+License: MIT
+Keywords: invenio vocabulary management
+Platform: any
+Classifier: Development Status :: 5 - Production/Stable
+Requires-Python: >=3.7
+License-File: LICENSE
+License-File: AUTHORS.rst
+Requires-Dist: invenio-i18n<3.0.0,>=2.0.0
+Requires-Dist: invenio-records-resources<6.0.0,>=5.0.0
+Requires-Dist: lxml>=4.5.0
+Requires-Dist: PyYAML>=5.4.1
+Provides-Extra: tests
+Requires-Dist: pytest-black-ng>=0.4.0; extra == "tests"
+Requires-Dist: invenio-app<2.0.0,>=1.4.0; extra == "tests"
+Requires-Dist: invenio-db[mysql,postgresql]<2.0.0,>=1.0.14; extra == "tests"
+Requires-Dist: pytest-invenio<3.0.0,>=2.1.0; extra == "tests"
+Requires-Dist: Sphinx>=4.5; extra == "tests"
+Provides-Extra: elasticsearch7
+Requires-Dist: invenio-search[elasticsearch7]<3.0.0,>=2.1.0; extra == "elasticsearch7"
+Provides-Extra: opensearch1
+Requires-Dist: invenio-search[opensearch1]<3.0.0,>=2.1.0; extra == "opensearch1"
+Provides-Extra: opensearch2
+Requires-Dist: invenio-search[opensearch2]<3.0.0,>=2.1.0; extra == "opensearch2"
+Provides-Extra: mysql
+Provides-Extra: postgresql
+Provides-Extra: sqlite
+Dynamic: license-file
+
+..
+    Copyright (C) 2020-2021 CERN.
+
+    Invenio-Vocabularies is free software; you can redistribute it and/or
+    modify it under the terms of the MIT License; see LICENSE file for more
+    details.
+
+======================
+ Invenio-Vocabularies
+======================
+
+.. image:: https://github.com/inveniosoftware/invenio-vocabularies/workflows/CI/badge.svg
+        :target: https://github.com/inveniosoftware/invenio-vocabularies/actions?query=workflow%3ACI
+
+.. image:: https://img.shields.io/coveralls/inveniosoftware/invenio-vocabularies.svg
+        :target: https://coveralls.io/r/inveniosoftware/invenio-vocabularies
+
+.. image:: https://img.shields.io/github/tag/inveniosoftware/invenio-vocabularies.svg
+        :target: https://github.com/inveniosoftware/invenio-vocabularies/releases
+
+.. image:: https://img.shields.io/pypi/dm/invenio-vocabularies.svg
+        :target: https://pypi.python.org/pypi/invenio-vocabularies
+
+.. image:: https://img.shields.io/github/license/inveniosoftware/invenio-vocabularies.svg
+        :target: https://github.com/inveniosoftware/invenio-vocabularies/blob/master/LICENSE
+
+Invenio module for managing vocabularies, based on Invenio-Records and Invenio-Records-Resources. This module provides:
+
+- Factories for easily generating models, record API classes, services, and resources
+- Helpers for importing vocabularies
+
+Further documentation is available on
+https://invenio-vocabularies.readthedocs.io/
+
+..
+    Copyright (C) 2020-2024 CERN.
+    Copyright (C) 2025 KTH Royal Institute of Technology.
+
+    Invenio-Vocabularies is free software; you can redistribute it and/or
+    modify it under the terms of the MIT License; see LICENSE file for more
+    details.
+
+Changes
+=======
+
+Version 3.5.0 (released 2025-04-30)
+
+- fix: setuptools require underscores instead of dashes
+- ci: use reusable workflows
+- i18n: push translations
+- i18n: pulled translations
+
+Version 3.4.2 (released 2025-03-21)
+
+- i18n: mark missing strings for translations
+- tests: remove unecessary "enzyme-to-json" package
+- CI: use reusable workflows
+
+Version 3.4.1 (released 2024-04-19)
+
+- funders: exclude ROR schema v2 json (#309)
+
+
+Version 3.4.0 (released 2024-04-19)
+
+- templates: add subject fields UI template (#303)
+
+Version 3.3.0 (released 2024-04-16)
+
+- assets: add overridable awards and funding
+
+Version 3.2.0 (released 2024-03-22)
+
+- funding: add country and ror to funder search results
+- init: move record_once to finalize_app (removes deprecation on `before_first_request`)
+- installation: upgrade invenio-app
+
+
+Version 3.1.0 (released 2024-03-05)
+
+- custom_fields: added subject field
+- custom_fields: add pid_field to custom fields
+- mappings: change "dynamic" values to string
+- ci: upgrade tests matrix
+- bumps react-invenio-forms
+
+Version 3.0.0 (released 2024-01-30)
+
+- installation: bump invenio-records-resources
+
+Version 2.4.0 (2023-12-07)
+
+- schema: add validation for affiliations
+- mappings: add a text subfield for award acronyms
+- config: add new TWCF funder
+
+Version 2.3.1 (2023-11-01)
+
+- contrib: add affiliation suggestion by id
+
+Version 2.3.0 (2023-10-25)
+
+- contrib: allow search funders by id
+- contrib: funders and awards fix TransportError in OS caused by suggestion search in too many fields
+
+Version 2.2.4 (2023-10-19)
+
+- search: decrease number of searching fields
+
+Version 2.2.3 (2023-10-08)
+
+- contrib: fix ``name`` serialization for the Names vocabulary.
+
+Version 2.2.2 (2023-10-06)
+
+- alembic rcp: set explicit dependency on pidstore create table
+
+Version 2.2.1 (2023-10-02)
+
+- facets: change caching strategy by caching each vocabulary by id. Replace
+  lru_cache with invenio-cache to ensure that cache expiration uses a TTL that
+  is correctly computed.
+
+Version 2.2.0 (2023-09-19)
+
+- facets: implement in-memory cache
+
+Version 2.1.1 (2023-09-19)
+
+- funding: fixed accessiblity issues
+
+Version 2.1.0 (2023-09-15)
+
+- custom_fields: allow to pass schema to the VocabularyCF
+- affiliations: add facet labels
+
+Version 2.0.0 (2023-09-14)
+
+- contrib-awards: add "program" to schema fields
+- global: switch names and affiliations to model PID field
+- ci: update matrix
+- awards: add "program" field
+- config: update awards funders mapping
+- service: add sort option to load vocabs
+
+Version 1.6.0 (2023-09-12)
+
+- awards: add acronym to schema
+
+Version 1.5.1 (2023-07-07)
+
+- fix string type columns for mysql
+
+Version 1.5.0 (2023-04-25)
+
+- upgrade invenio-records-resources
+
+Version 1.4.0 (2023-04-20)
+
+- upgrade invenio-records-resources
+
+Version 1.3.0 (2023-04-20)
+
+- add UI deposit contrib components
+
+Version 1.2.0 (2023-03-24)
+
+- bump invenio-records-resources to v2.0.0
+
+Version 1.1.0 (released 2023-03-02)
+
+- serializers: deprecate marshamllow JSON
+- mappings: add dynamic template for i18n titles and descriptions
+- remove deprecated flask-babelex dependency and imports
+
+Version 1.0.4 (released 2023-01-20)
+
+- funders: Add ROR to identifiers for all funders in datastream
+- facets: add not found facet exception (when facet is configured but not provided in setup)
+- facets: handle non existing vocabulary type
+
+Version 1.0.3 (released 2022-11-25)
+
+- Add i18n translations.
+
+Version 1.0.2 (released 2022-11-14)
+
+- Fix missing field_args in VocabularyCF
+
+Version 1.0.1 (released 2022-11-14)
+
+- Allow kwargs in VocabularyCF
+
+Version 1.0.0 (released 2022-11-04)
+
+- Bump invenio-records-resources
+
+Version 0.1.5 (released 2020-12-11)
+
+- Bug fixes in contrib vocabulary
+
+Version 0.1.4 (released 2020-12-11)
+
+- Add subjects vocabulary
+
+Version 0.1.3 (released 2020-12-11)
+
+- Include csv vocabularies data
+
+Version 0.1.2 (released 2020-12-11)
+
+- CI changes
+
+Version 0.1.1 (released 2020-12-11)
+
+- Add vocabulary import command
+
+Version 0.1.0 (released 2020-12-08)
+
+- Initial public release.

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2020-2024 CERN.
+# Copyright (C) 2025 KTH Royal Institute of Technology.
 #
 # Invenio-Vocabularies is free software; you can redistribute it and/or
 # modify it under the terms of the MIT License; see LICENSE file for more
@@ -10,6 +11,6 @@
 
 from .ext import InvenioVocabularies
 
-__version__ = "3.4.1"
+__version__ = "3.5.0"
 
 __all__ = ("__version__", "InvenioVocabularies")

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/package.json

@@ -13,7 +13,6 @@
     "coveralls": "^3.0.0",
     "enzyme": "^3.10.0",
     "enzyme-adapter-react-16": "^1.15.0",
-    "enzyme-to-json": "^3.4.0",
     "expect": "^26.0.0",
     "lodash": "^4.17.0",
     "luxon": "^1.23.0",
@@ -22,10 +21,5 @@
     "react-scripts": "^5.0.1",
     "semantic-ui-react": "^2.1.0",
     "react-overridable": "^0.0.3"
-  },
-  "jest": {
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ]
   }
 }

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/CustomAwardForm.js

@@ -100,7 +100,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
       </Overridable>
       <Overridable id="InvenioVocabularies.CustomAwardForm.AwardInformationHeader.Container">
         <Header as="h3" size="small">
-          {i18next.t("Award information")} ({i18next.t("optional")})
+          {i18next.t("Additional information")} ({i18next.t("optional")})
         </Header>
       </Overridable>
       <Form.Group widths="equal">
@@ -110,7 +110,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("Number")}
-            placeholder={i18next.t("Award number")}
+            placeholder={i18next.t("Award/Grant number")}
             fieldPath="selectedFunding.award.number"
           />
         </Overridable>
@@ -120,7 +120,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("Title")}
-            placeholder={i18next.t("Award Title")}
+            placeholder={i18next.t("Award/Grant Title")}
             fieldPath="selectedFunding.award.title"
           />
         </Overridable>
@@ -130,7 +130,7 @@ function CustomAwardForm({ deserializeFunder, selectedFunding }) {
         >
           <TextField
             label={i18next.t("URL")}
-            placeholder={i18next.t("Award URL")}
+            placeholder={i18next.t("Award/Grant URL")}
             fieldPath="selectedFunding.award.url"
           />
         </Overridable>

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingField.js

@@ -123,7 +123,7 @@ function FundingFieldForm(props) {
                 className="mb-5"
               >
                 <Icon name="add" />
-                {i18next.t("Add award")}
+                {i18next.t("Add")}
               </Button>
             }
             onAwardChange={(selectedFunding) => {

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/FundingModal.js

@@ -157,8 +157,8 @@ function FundingModal({
         >
           <Modal.Header as="h2" className="pt-10 pb-10">
             {mode === "standard"
-              ? i18next.t("Add standard award")
-              : i18next.t("Add custom award")}
+              ? i18next.t("Add standard award/grant")
+              : i18next.t("Add custom funding")}
           </Modal.Header>
           <Modal.Content>
             {mode === ModalTypes.STANDARD && (
@@ -172,7 +172,7 @@ function FundingModal({
                   <Grid.Row>
                     <Grid.Column width={11} floated="left" verticalAlign="middle">
                       <SearchBar
-                        placeholder={i18next.t("Search for awards")}
+                        placeholder={i18next.t("Search for awards/grants")}
                         autofocus
                         actionProps={{
                           icon: "search",
@@ -234,9 +234,7 @@ function FundingModal({
               primary
               icon="checkmark"
               content={
-                action === ModalActions.ADD
-                  ? i18next.t("Add award")
-                  : i18next.t("Change award")
+                action === ModalActions.ADD ? i18next.t("Add") : i18next.t("Change")
               }
             />
           </Modal.Actions>

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/assets/semantic-ui/js/invenio_vocabularies/src/contrib/forms/Funding/NoAwardResults.js

@@ -16,7 +16,7 @@ export function NoAwardResults({ switchToCustom }) {
       basic
       content={
         <p>
-          {i18next.t("Did not find your award? ")}
+          {i18next.t("Did not find your award/grant? ")}
           <a
             href="/"
             onClick={(e) => {
@@ -24,7 +24,7 @@ export function NoAwardResults({ switchToCustom }) {
               switchToCustom();
             }}
           >
-            {i18next.t("Add a custom award.")}
+            {i18next.t("Add a custom award/grant.")}
           </a>
         </p>
       }

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/records/models.py

@@ -9,6 +9,7 @@
 """Vocabulary models."""
 
 from invenio_db import db
+from invenio_i18n import gettext as _
 from invenio_records.models import RecordMetadataBase
 
 
@@ -79,9 +80,9 @@ class VocabularyScheme(db.Model):
         """Create a new vocabulary subtype."""
         banned = [",", ":"]
         for b in banned:
-            assert (
-                b not in data["id"]
-            ), f"No '{b}' allowed in VocabularyScheme.id"  # noqa
+            assert b not in data["id"], _(
+                "No '%(banned_char)s' allowed in VocabularyScheme.id", banned_char=b
+            )
 
         with db.session.begin_nested():
             obj = cls(**data)

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/services/custom_fields/subject.py

@@ -53,12 +53,12 @@ SUBJECT_FIELDS_UI = [
                 ui_widget="SubjectAutocompleteDropdown",
                 isGenericVocabulary=False,
                 props=dict(
-                    label="Keywords and subjects",
+                    label=_("Keywords and subjects"),
                     icon="tag",
-                    description="The subjects related to the community",
-                    placeholder="Search for a subject by name e.g. Psychology ...",
+                    description=_("The subjects related to the community"),
+                    placeholder=_("Search for a subject by name e.g. Psychology ..."),
                     autocompleteFrom="api/subjects",
-                    noQueryMessage="Search for subjects...",
+                    noQueryMessage=_("Search for subjects..."),
                     autocompleteFromAcceptHeader="application/vnd.inveniordm.v1+json",
                     required=False,
                     multiple=True,

{invenio-vocabularies-3.4.1 → invenio_vocabularies-3.5.0}/invenio_vocabularies/services/schema.py

@@ -35,6 +35,9 @@ class BaseVocabularyRelationSchema(Schema):
 
     id = SanitizedUnicode(required=True)
 
+    # Nested field type for administration UI form generation
+    administration_schema_type = "vocabulary"
+
 
 class VocabularyRelationSchema(BaseVocabularyRelationSchema):
     """Vocabulary relation schema."""
@@ -63,6 +66,9 @@ class ContribVocabularyRelationSchema(Schema):
     ftf_name = None  # free text field name
     parent_field_name = None
 
+    # Nested field type for administration UI form generation
+    administration_schema_type = "vocabulary"
+
     @validates_schema
     def validate_relation_schema(self, data, **kwargs):
         """Validates that either id either the free text field are present."""
@@ -91,6 +97,9 @@ class BaseVocabularySchema(BaseRecordSchema):
     description = i18n_strings
     icon = fields.Str(allow_none=False)
 
+    # Nested field type for administration UI form generation
+    administration_schema_type = "vocabulary"
+
 
 class VocabularySchema(BaseVocabularySchema):
     """Service schema for vocabulary records."""