commonmeta-py 0.41__py3-none-any.whl → 0.42__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.41"
+__version__ = "0.42"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

commonmeta/constants.py

@@ -610,6 +610,8 @@ INVENIORDM_IDENTIFIER_TYPES = {
     "URL": "url",
     "URN": "urn",
     "W3ID": "w3id",
+    "GUID": "guid",
+    "UUID": "uuid",
     "Other": "other",
 }
 

commonmeta/crossref_utils.py

@@ -363,10 +363,12 @@ def insert_funding_references(metadata, xml):
         )
         if funding_reference.get("funderIdentifier", None) is not None:
             funder_identifier = funding_reference.get("funderIdentifier", None)
-            
+
             # translate ROR to Crossref funder ID until Crossref supports ROR
-            funder_identifier = ROR_TO_CROSSREF_FUNDER_ID_TRANSLATIONS.get(funder_identifier, funder_identifier)
-            
+            funder_identifier = ROR_TO_CROSSREF_FUNDER_ID_TRANSLATIONS.get(
+                funder_identifier, funder_identifier
+            )
+
             etree.SubElement(
                 funder_name,
                 "assertion",
@@ -447,9 +449,7 @@ def insert_item_number(metadata, xml):
     if metadata.identifiers is None:
         return xml
     for identifier in metadata.identifiers:
-        if identifier.get("identifier", None) is None:
-            continue
-        if identifier.get("identifierType", None) is not None:
+        if identifier.get("identifierType", None) == "UUID":
             # strip hyphen from UUIDs, as item_number can only be 32 characters long (UUIDv4 is 36 characters long)
             if identifier.get("identifierType", None) == "UUID":
                 identifier["identifier"] = identifier.get("identifier", "").replace(
@@ -461,9 +461,7 @@ def insert_item_number(metadata, xml):
                 {"item_number_type": identifier.get("identifierType", "").lower()},
             ).text = identifier.get("identifier", None)
         else:
-            etree.SubElement(xml, "item_number").text = identifier.get(
-                "identifier", None
-            )
+            continue
     return xml
 
 

commonmeta/readers/json_feed_reader.py

@@ -127,7 +127,10 @@ def read_json_feed_item(data: Optional[dict], **kwargs) -> Commonmeta:
                 "type": "IsPartOf",
             }
         )
-    identifiers = [{"identifier": meta.get("id"), "identifierType": "UUID"}]
+    identifiers = [
+        {"identifier": meta.get("id"), "identifierType": "UUID"},
+        {"identifier": meta.get("guid"), "identifierType": "GUID"},
+    ]
     files = get_files(_id)
     state = "findable" if meta or read_options else "not_found"
 
@@ -237,13 +240,15 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             else:
                 award_number = f.path.segments[-1]
             return [
-                compact({
-                    "funderName": funder_name,
-                    "funderIdentifier": urls[0],
-                    "funderIdentifierType": "Crossref Funder ID",
-                    "awardUri": urls[1],
-                    "awardNumber": award_number,
-                })
+                compact(
+                    {
+                        "funderName": funder_name,
+                        "funderIdentifier": urls[0],
+                        "funderIdentifierType": "Crossref Funder ID",
+                        "awardUri": urls[1],
+                        "awardNumber": award_number,
+                    }
+                )
             ]
         # URL is ROR ID for funder.
         elif len(urls) == 2 and validate_ror(urls[0]):
@@ -254,7 +259,7 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
             funder_name = ror.get("name", None)
             funder_identifier = urls[0]
             funder_identifier_type = "ROR"
-            
+
             f = furl(urls[1])
             # url is for NSF grant
             if f.args["awd_id"] is not None:
@@ -263,13 +268,15 @@ def get_funding_references(meta: Optional[dict]) -> Optional[list]:
                 award_number = f.path.segments[-1]
             return [
                 compact(
-                    compact({
-                        "funderName": funder_name,
-                        "funderIdentifier": funder_identifier,
-                        "funderIdentifierType": funder_identifier_type,
-                        "awardUri": urls[1],
-                        "awardNumber": award_number,
-                    })
+                    compact(
+                        {
+                            "funderName": funder_name,
+                            "funderIdentifier": funder_identifier,
+                            "funderIdentifierType": funder_identifier_type,
+                            "awardUri": urls[1],
+                            "awardNumber": award_number,
+                        }
+                    )
                 )
             ]
 

commonmeta/resources/commonmeta_v0.15.json

@@ -274,6 +274,7 @@
                   "URL",
                   "URN",
                   "UUID",
+                  "GUID",
                   "Other"
                 ]
               }

commonmeta/writers/inveniordm_writer.py

@@ -16,7 +16,6 @@ from ..utils import (
     get_language,
     validate_orcid,
     id_from_url,
-    issn_from_url,
     FOS_MAPPINGS,
 )
 
@@ -39,8 +38,9 @@ def write_inveniordm(metadata):
             ),
         }
         for i in wrap(metadata.identifiers)
-        if i.get("id", None) != metadata.id
+        if i.get("identifier", None) != metadata.id
     ]
+    print(identifiers, metadata.id)
     references = [
         to_inveniordm_related_identifier(i)
         for i in wrap(metadata.references)

{commonmeta_py-0.41.dist-info → commonmeta_py-0.42.dist-info}/METADATA

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

{commonmeta_py-0.41.dist-info → commonmeta_py-0.42.dist-info}/RECORD

@@ -1,10 +1,10 @@
-commonmeta/__init__.py,sha256=p-9XQa_lbjKjoWcroP_4xCUpiuGwBdhjbY21Wx2YJiw,1779
+commonmeta/__init__.py,sha256=naCUZCROir98krn1AQOnhfIgytkFpTFPwNLqEKk237w,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=0t6fr9XGeeTBoMlKSAMI7p_EmKsA6wYRW0roEBXVcc8,3722
 commonmeta/cli.py,sha256=0IJF1SQ1sKPg7M0Gb8fpX2nBps-G0L13o01__M6c5Z0,6104
-commonmeta/constants.py,sha256=cank4niDCO-VvjjRIgCxOAqFEnV1R8xyGC6xEL1iDsw,17461
-commonmeta/crossref_utils.py,sha256=LBYfmhIldYryaBUYohfLnv870aWGMDm043Ny8Wav6Bg,22370
+commonmeta/constants.py,sha256=VfjXLkwoV4A5uztH3vgDJ_qrt7PaWGO6QtHbAt4r03c,17501
+commonmeta/crossref_utils.py,sha256=qJlTZtfKR2shAXQDm8VBYUujKFkTtZTUz19GuMUANaI,22198
 commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
 commonmeta/metadata.py,sha256=dqqk4IW-_OwtS_PVs0i7AuxrkNqOYjJCqhQJ2X-I1DQ,12398
@@ -19,7 +19,7 @@ commonmeta/readers/csl_reader.py,sha256=5V_sHSJwcAWJmhB8SYk199nB96BWYX1Sq9vkQ3iE
 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=y-sX_l9AD0I71pSZSZWr2x2tLTlD4mxoB2eF0vf0rWk,13034
+commonmeta/readers/json_feed_reader.py,sha256=_DZGEfFGrrooUjA-SNYg1WKJKdV6nA4Ez3HSswvQ6qs,13237
 commonmeta/readers/kbase_reader.py,sha256=ehKXQsJyPCtaq2FmBxNb2Jb5Nktpx8pNscpmEM6N0A4,6763
 commonmeta/readers/ris_reader.py,sha256=v6qOd-i2OcMTEFy5RGd3MlYthJcYSU6yzmZ5yHDzmII,3677
 commonmeta/readers/schema_org_reader.py,sha256=xyWzO2XAWlI2pYVl2EbVRsUmfiWXEwP64CHRBQNRN-M,16835
@@ -27,7 +27,7 @@ commonmeta/resources/cff_v1.2.0.json,sha256=MpfjDYgX7fN9PLiG54ISZ2uu9WItNqfh-yaR
 commonmeta/resources/commonmeta_v0.12.json,sha256=HUSNReXh2JN3Q6YWSt7CE69js8dh50OlpMYGTyU98oU,16762
 commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
 commonmeta/resources/commonmeta_v0.14.json,sha256=nACmkTe4IrZkygd5AeJnAv9P4EWfzCwW9oL5AhubvnE,17657
-commonmeta/resources/commonmeta_v0.15.json,sha256=tOc1QL2n9HYngEgxIZDwBFWEXxX1bd2wtOqCqI0usnw,17707
+commonmeta/resources/commonmeta_v0.15.json,sha256=dZsWu7DOHL04v1tYAX1RE4Kyn_mt0HnJvEZRKvc8w0A,17733
 commonmeta/resources/crossref/AccessIndicators.xsd,sha256=en-G2FFt4ewIFRw5C6g4YA8Nc0M66fCM2CygiO_ZqqY,2825
 commonmeta/resources/crossref/JATS-journalpublishing1-3d2-mathml3-elements.xsd,sha256=l5jJMFm4xx09bavH2Gc3EqIdr-0PTf6M9YBTNpUaZhY,415409
 commonmeta/resources/crossref/JATS-journalpublishing1-3d2-mathml3.xsd,sha256=goO2ckm12fF2-kGFZC_FaTBdi4BK3YCRwb_ESur8dfY,2210
@@ -66,11 +66,11 @@ commonmeta/writers/commonmeta_writer.py,sha256=2qlttCfYpGhfVjrYkjzbIra7AywssRLT3
 commonmeta/writers/crossref_xml_writer.py,sha256=0Ds494RnXfdfjWw5CLX1kwV2zP7gqffdVqO-X74Uc6c,492
 commonmeta/writers/csl_writer.py,sha256=rlCeShkvC6ui9By0yVfNCMay_JfaZ4AooUPOPg-g-2M,2819
 commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_iiaQRDnV24,6233
-commonmeta/writers/inveniordm_writer.py,sha256=phizoSJVVHfP_wABXTKCIi7HpG7mSZbNDYVbNWoW4UQ,9435
+commonmeta/writers/inveniordm_writer.py,sha256=0bmWvZRdAqaiR2Tf7H6PZdUcbfpcd-fyMROR9lvEis4,9460
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.41.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.41.dist-info/METADATA,sha256=c0f4bEW3LY-00aqohuS0MYIuBgl7mMxkDrTwRmaGrcA,8331
-commonmeta_py-0.41.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.41.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.41.dist-info/RECORD,,
+commonmeta_py-0.42.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.42.dist-info/METADATA,sha256=aVEkYNm4B0-6uEYClz2MzXyUGVQ2Py2yyuyJfbO2Lv4,8331
+commonmeta_py-0.42.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+commonmeta_py-0.42.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.42.dist-info/RECORD,,