commonmeta-py 0.30__tar.gz → 0.31__tar.gz

{commonmeta_py-0.30 → commonmeta_py-0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.30
+Version: 0.31
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT

{commonmeta_py-0.30 → commonmeta_py-0.31}/commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.30"
+__version__ = "0.31"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

{commonmeta_py-0.30 → commonmeta_py-0.31}/commonmeta/writers/inveniordm_writer.py

@@ -1,13 +1,12 @@
 """InvenioRDM writer for commonmeta-py"""
 
 import orjson as json
-import pydash as py_
 
-from ..utils import to_inveniordm
-from ..base_utils import compact, wrap, presence, parse_attributes
-from ..doi_utils import doi_from_url, validate_suffix
+from ..base_utils import compact, wrap, parse_attributes
+from ..date_utils import get_iso8601_date
+from ..doi_utils import doi_from_url
 from ..constants import CM_TO_INVENIORDM_TRANSLATIONS
-from ..utils import pages_as_string, get_language, validate_orcid
+from ..utils import get_language, validate_orcid
 
 
 def write_inveniordm(metadata):
@@ -40,6 +39,8 @@ def write_inveniordm(metadata):
         if container.get("identifierType", None) == "ISSN"
         else None
     )
+
+    subjects = [to_inveniordm_subject(i) for i in wrap(metadata.subjects)]
     data = compact(
         {
             "pids": {
@@ -60,15 +61,16 @@ def write_inveniordm(metadata):
                     "publisher": metadata.publisher.get("name", None)
                     if metadata.publisher
                     else None,
-                    "publication_date": metadata.date.get("published")
+                    "publication_date": get_iso8601_date(metadata.date.get("published"))
                     if metadata.date.get("published", None)
                     else None,
                     "dates": [
-                        {"date": metadata.date.get("updated"), "type": "updated"}
+                        {
+                            "date": metadata.date.get("updated"),
+                            "type": {"id": "updated"},
+                        }
                     ],
-                    "subjects": parse_attributes(
-                        wrap(metadata.subjects), content="subject", first=False
-                    ),
+                    "subjects": subjects,
                     "description": parse_attributes(
                         metadata.descriptions, content="description", first=True
                     ),
@@ -124,3 +126,13 @@ def to_inveniordm_creator(creator: dict) -> dict:
             }
         )
     }
+
+
+def to_inveniordm_subject(subject: dict) -> dict:
+    """Convert subjects to inveniordm subjects"""
+    return compact(
+        {
+            "id": subject.get("id", None),
+            "subject": subject.get("subject", None),
+        }
+    )

{commonmeta_py-0.30 → commonmeta_py-0.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name="commonmeta-py"
-version="0.30"
+version="0.31"
 repository = "https://github.com/front-matter/commonmeta-py"
 homepage = "https://python.commonmeta.org"
 documentation = "https://python.commonmeta.org"