commonmeta-py 0.17.2__tar.gz → 0.17.3__tar.gz

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/PKG-INFO

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

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/author_utils.py

@@ -108,6 +108,9 @@ def get_one_author(author, **kwargs):
         else:
             given_name = None
             family_name = None
+  
+    # support various keys for affiliations
+    affiliations = author.get("affiliation", None) or author.get("affiliations", None)
 
     # return author in commonmeta format, using name vs. given/family name
     # depending on type
@@ -119,7 +122,7 @@ def get_one_author(author, **kwargs):
             "name": name if _type == "Organization" else None,
             "givenName": given_name if _type == "Person" else None,
             "familyName": family_name if _type == "Person" else None,
-            "affiliation": presence(get_affiliations(wrap(author.get("affiliation", None)))
+            "affiliations": presence(get_affiliations(wrap(affiliations))
             ),
         }
     )

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/crossref_utils.py

@@ -131,8 +131,12 @@ def insert_crossref_contributors(metadata, xml):
     ]
     for num, contributor in enumerate(con):
         contributor_role = (
-            "author" if contributor.get("contributorRoles") == ["Author"] else "editor"
+            "author" if "Author" in contributor.get("contributorRoles") else None
         )
+        if contributor_role is None:
+            contributor_role = (
+                "editor" if "Editor" in contributor.get("contributorRoles") else None
+            )
         sequence = "first" if num == 0 else "additional"
         if (
             contributor.get("type", None) == "Organization"
@@ -153,7 +157,7 @@ def insert_crossref_contributors(metadata, xml):
                 {"contributor_role": contributor_role, "sequence": sequence},
             )
             person_name = insert_crossref_person(contributor, person_name)
-        elif contributor.get("affiliation", None) is not None:
+        elif contributor.get("affiliations", None) is not None:
             anonymous = etree.SubElement(
                 contributors,
                 "anonymous",
@@ -176,18 +180,17 @@ def insert_crossref_person(contributor, xml):
     if contributor.get("familyName", None) is not None:
         etree.SubElement(xml, "surname").text = contributor.get("familyName")
 
-    if contributor.get("affiliation", None) is not None:
+    if contributor.get("affiliations", None) is not None:
         affiliations = etree.SubElement(xml, "affiliations")
         institution = etree.SubElement(affiliations, "institution")
-        if py_.get(contributor, "affiliation.0.name") is not None:
+        if py_.get(contributor, "affiliations.0.name") is not None:
             etree.SubElement(institution, "institution_name").text = py_.get(
-                contributor, "affiliation.0.name"
+                contributor, "affiliations.0.name"
             )
-        if py_.get(contributor, "affiliation.0.id") is not None:
+        if py_.get(contributor, "affiliations.0.id") is not None:
             etree.SubElement(
                 institution, "institution_id", {"type": "ror"}
-            ).text = py_.get(contributor, "affiliation.0.id")
-
+            ).text = py_.get(contributor, "affiliations.0.id")
     orcid = normalize_orcid(contributor.get("id", None))
     if orcid is not None:
         etree.SubElement(xml, "ORCID").text = orcid
@@ -196,13 +199,13 @@ def insert_crossref_person(contributor, xml):
 
 def insert_crossref_anonymous(contributor, xml):
     """Insert crossref anonymous"""
-    if contributor.get("affiliation", None) is None:
+    if contributor.get("affiliations", None) is None:
         return xml
     affiliations = etree.SubElement(xml, "affiliations")
     institution = etree.SubElement(affiliations, "institution")
-    if py_.get(contributor, "affiliation.0.name") is not None:
+    if py_.get(contributor, "affiliations.0.name") is not None:
         etree.SubElement(institution, "institution_name").text = py_.get(
-            contributor, "affiliation.0.name"
+            contributor, "affiliations.0.name"
         )
     return xml
 

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/readers/crossref_reader.py

@@ -95,7 +95,7 @@ def read_crossref(data: Optional[dict], **kwargs) -> Commonmeta:
     identifiers.append(
         compact(
             {
-                "identifier": normalize_doi(_id),
+                "identifier": _id,
                 "identifierType": "DOI",
             }
         )
@@ -144,11 +144,11 @@ def read_crossref(data: Optional[dict], **kwargs) -> Commonmeta:
         "type": _type,
         # recommended and optional properties
         "additionalType": None,
-        "archiveLocations": archive_locations,
+        "archiveLocations": presence(archive_locations),
         "container": presence(container),
         "contributors": presence(contributors),
         "date": presence(date),
-        "descriptions": descriptions,
+        "descriptions": presence(descriptions),
         "files": presence(files),
         "fundingReferences": presence(funding_references),
         "geoLocations": None,

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/readers/datacite_reader.py

@@ -113,28 +113,26 @@ def read_datacite(data: dict, **kwargs) -> Commonmeta:
         # required properties
         "id": _id,
         "type": _type,
-        "doi": doi_from_url(_id),
-        "url": normalize_url(meta.get("url", None)),
-        "contributors": presence(contributors),
-        "titles": titles,
-        "publisher": publisher,
-        "date": compact(date),
         # recommended and optional properties
         "additionalType": additional_type,
-        "subjects": presence(subjects),
-        "language": meta.get("language", None),
+        "container": presence(container),
+        "contributors": presence(contributors),
+        "date": compact(date),
+        "descriptions": presence(descriptions),
+        "files": presence(files),
+        "fundingReferences": presence(meta.get("fundingReferences", None)),
+        "geoLocations": presence(geo_locations),
         "identifiers": presence(identifiers),
-        "version": meta.get("version", None),
+        "language": meta.get("language", None),
         "license": presence(license_),
-        "descriptions": descriptions,
-        "geoLocations": presence(geo_locations),
-        "fundingReferences": presence(meta.get("fundingReferences", None)),
+        "provider": "DataCite",
+        "publisher": publisher,
         "references": presence(references),
         "relations": presence(relations),
-        # other properties
-        "files": presence(files),
-        "container": presence(container),
-        "provider": "DataCite",
+        "subjects": presence(subjects),
+        "titles": presence(titles),
+        "url": normalize_url(meta.get("url", None)),
+        "version": meta.get("version", None),
     } | read_options
 
 

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/resources/commonmeta_v0.13.json

@@ -248,7 +248,6 @@
               "$ref": "#/definitions/contributorRole"
             },
             "type": "array",
-            "minItems": 1,
             "uniqueItems": true
           }
         }
@@ -333,7 +332,6 @@
         },
         "required": ["url"]
       },
-      "minItems": 1,
       "uniqueItems": true
     },
     "fundingReferences": {

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/commonmeta/writers/datacite_writer.py

@@ -160,7 +160,7 @@ def to_datacite_creator(creator: dict) -> dict:
             "familyName": creator.get("familyName", None),
             "nameType": _type + "al" if _type else None,
             "nameIdentifiers": name_identifiers,
-            "affiliation": creator.get("affiliation", None),
+            "affiliation": creator.get("affiliations", None),
         }
     )
 

{commonmeta_py-0.17.2 → commonmeta_py-0.17.3}/pyproject.toml

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