commonmeta-py 0.65__py3-none-any.whl → 0.67__py3-none-any.whl

commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.65"
+__version__ = "0.67"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 
@@ -56,6 +56,9 @@ from .utils import (
     get_language,
     name_to_fos,
     from_json_feed,
+    extract_url,
+    extract_urls,
+    extract_curie,
 )
 from .author_utils import (
     authors_as_string,

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.65.dist-info → commonmeta_py-0.67.dist-info}/METADATA

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

{commonmeta_py-0.65.dist-info → commonmeta_py-0.67.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=LqrBGNgQuAGQiRF9HrhX5iHHu14t44M7nTTOYmg4Rmc,1821
+commonmeta/__init__.py,sha256=oaZovB6Kv0Kim3vDBUccMmL6vcxr5qCBgjui_sPuut4,1875
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -19,7 +19,7 @@ commonmeta/readers/csl_reader.py,sha256=IO8uj-L_BzPFWgfRzYCF9VbK5rBPBzDqak7iBELg
 commonmeta/readers/datacite_reader.py,sha256=CdOtxhthrakBoQMsLTdPx6sUCmqtEWo5ICYE6ZsWDdo,12026
 commonmeta/readers/datacite_xml_reader.py,sha256=nhnO92fZihr1HZlbXjyem-HJXc9_DWLgJ2zeltuPMIg,13041
 commonmeta/readers/inveniordm_reader.py,sha256=jzv0rXzT8OCdPD_MShBXTnlwD-F9tpTX7OKZGn8smzs,7480
-commonmeta/readers/json_feed_reader.py,sha256=ctlASyxByjXDVgREzdeYOCZezn9aFFv3yKogDFd8WNs,14174
+commonmeta/readers/json_feed_reader.py,sha256=G1q-Oq9keqBZYsWKtVE8EWr4rgQQYrNLMqKA7MSYXMg,13698
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=udvRBeEnsyRmy5UOIk523f7x08RRLvxqTCMMS736oFs,17132
@@ -69,8 +69,8 @@ commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_ii
 commonmeta/writers/inveniordm_writer.py,sha256=YXLfiMkWDMMd7ZlOzhp0zNieQFfHKZ4m5FQLIl_XuWI,11427
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.65.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.65.dist-info/METADATA,sha256=th0VmBY3Kk5evcQrUOk55lTyqjeZ6CEuXnvumG_Duvc,8279
-commonmeta_py-0.65.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.65.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.65.dist-info/RECORD,,
+commonmeta_py-0.67.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.67.dist-info/METADATA,sha256=ZrYD5ZRb62updM7F6xo7bsHrM21OVv0bcgYNkI3BEs0,8279
+commonmeta_py-0.67.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.67.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.67.dist-info/RECORD,,