commonmeta-py 0.66__tar.gz → 0.68__tar.gz

{commonmeta_py-0.66 → commonmeta_py-0.68}/PKG-INFO

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

{commonmeta_py-0.66 → commonmeta_py-0.68}/commonmeta/__init__.py

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

{commonmeta_py-0.66 → commonmeta_py-0.68}/commonmeta/readers/json_feed_reader.py

@@ -182,36 +182,25 @@ def get_references(references: list) -> list:
 
         if reference.get("id", None) and validate_doi(reference.get("id")):
             id_ = normalize_doi(reference.get("id"))
-            return compact(
-                {
-                    "id": id_,
-                    "key": reference.get("key", None),
-                    "title": reference.get("title", None),
-                    "publicationYear": reference.get("publicationYear", None),
-                    "unstructured": reference.get("unstructured", None),
-                }
-            )
-
         else:
             id_ = normalize_url(reference.get("id", None))
-            if id_ is None:
-                return None
-            return compact(
-                {
-                    "id": id_,
-                    "key": reference.get("key", None),
-                    "title": reference.get("title", None),
-                    "publicationYear": reference.get("publicationYear", None),
-                    "unstructured": reference.get("unstructured", None),
-                }
-            )
+            
+        return compact(
+            {
+                "id": id_,
+                "key": reference.get("key", None),
+                "title": reference.get("title", None),
+                "publicationYear": reference.get("publicationYear", None),
+                "unstructured": reference.get("unstructured", None),
+            }
+        )
 
     def number_reference(reference: dict, index: int) -> dict:
         """number reference"""
         reference["key"] = f"ref{index + 1}"
         return reference
 
-    references = [get_reference(i) for i in references if i.get("id", None)]
+    references = [get_reference(i) for i in references]
     return [
         number_reference(i, index)
         for index, i in enumerate(references)

{commonmeta_py-0.66 → commonmeta_py-0.68}/commonmeta/writers/inveniordm_writer.py

@@ -283,9 +283,9 @@ def to_inveniordm_reference(reference: dict) -> dict:
         # remove optional trailing period
         unstructured = unstructured.rstrip(" .")
 
-        if reference.get("id", None):
+        if identifier:
             # remove duplicate ID from unstructured reference
-            unstructured = unstructured.replace(reference.get("id"), "")
+            unstructured = unstructured.replace(identifier, "")
 
         return compact(
             {

{commonmeta_py-0.66 → commonmeta_py-0.68}/pyproject.toml

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