commonmeta-py 0.27__tar.gz → 0.29__tar.gz

{commonmeta_py-0.27 → commonmeta_py-0.29}/PKG-INFO

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

{commonmeta_py-0.27 → commonmeta_py-0.29}/commonmeta/__init__.py

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

{commonmeta_py-0.27 → commonmeta_py-0.29}/commonmeta/writers/inveniordm_writer.py

@@ -50,30 +50,40 @@ def write_inveniordm(metadata):
             },
             "access": {"record": "public", "files": "public"},
             "files": {"enabled": True},
-            "metadata": {
-                "resource_type": {"id": _type},
-                "creators": creators,
-                "title": parse_attributes(metadata.titles, content="title", first=True),
-                "publisher": metadata.publisher.get("name", None) if metadata.publisher else None,
-                "publication_date": metadata.date.get("published")
-                if metadata.date.get("published", None)
-                else None,
-                "dates": [{"date": metadata.date.get("updated"), "type": "updated"}],
-                "subjects": parse_attributes(
-                    wrap(metadata.subjects), content="subject", first=False
-                ),
-                "description": parse_attributes(
-                    metadata.descriptions, content="description", first=True
-                ),
-                "rights": [{"id": metadata.license.get("id", None)}]
-                if metadata.license
-                else None,
-                "languages": [{"id": get_language(metadata.language, format="alpha_3")}]
-                if metadata.language
-                else None,
-                "identifiers": identifiers,
-                "version": metadata.version,
-            },
+            "metadata": compact(
+                {
+                    "resource_type": {"id": _type},
+                    "creators": creators,
+                    "title": parse_attributes(
+                        metadata.titles, content="title", first=True
+                    ),
+                    "publisher": metadata.publisher.get("name", None)
+                    if metadata.publisher
+                    else None,
+                    "publication_date": metadata.date.get("published")
+                    if metadata.date.get("published", None)
+                    else None,
+                    "dates": [
+                        {"date": metadata.date.get("updated"), "type": "updated"}
+                    ],
+                    "subjects": parse_attributes(
+                        wrap(metadata.subjects), content="subject", first=False
+                    ),
+                    "description": parse_attributes(
+                        metadata.descriptions, content="description", first=True
+                    ),
+                    "rights": [{"id": metadata.license.get("id").lower()}]
+                    if metadata.license.get("id", None)
+                    else None,
+                    "languages": [
+                        {"id": get_language(metadata.language, format="alpha_3")}
+                    ]
+                    if metadata.language
+                    else None,
+                    "identifiers": identifiers,
+                    "version": metadata.version,
+                }
+            ),
             "custom_fields": {
                 "journal:journal": compact({"title": journal, "issn": issn}),
             },

{commonmeta_py-0.27 → commonmeta_py-0.29}/pyproject.toml

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