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

commonmeta/doi_utils.py

@@ -138,7 +138,6 @@ def encode_doi(prefix, number: Optional[int] = None, checksum: bool = True) -> s
         suffix = base32.encode(number, split_every=5, checksum=checksum)
     else:
         suffix = base32.generate(length=10, split_every=5, checksum=True)
-    print("s", suffix)
     return f"https://doi.org/{prefix}/{suffix}"
 
 
@@ -149,12 +148,9 @@ def decode_doi(doi: str, checksum: bool = True) -> int:
         if doi is None:
             return 0
         suffix = doi.split("/", maxsplit=1)[1]
-        print(suffix, checksum)
         if checksum:
             number = base32.decode(suffix, checksum=True)
-            print("n", number)
         number = base32.decode(suffix)
-        print("nn", number)
         return number
     except ValueError:
         return 0

commonmeta/readers/json_feed_reader.py

@@ -184,7 +184,7 @@ def get_references(references: list) -> list:
             id_ = normalize_doi(reference.get("id"))
         else:
             id_ = normalize_url(reference.get("id", None))
-            
+
         return compact(
             {
                 "id": id_,
@@ -195,17 +195,7 @@ def get_references(references: list) -> list:
             }
         )
 
-    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]
-    return [
-        number_reference(i, index)
-        for index, i in enumerate(references)
-        if i is not None
-    ]
+    return [get_reference(i) for i in references]
 
 
 def get_funding_references(meta: Optional[dict]) -> Optional[list]:

commonmeta/readers/schema_org_reader.py

@@ -105,7 +105,6 @@ def get_schema_org(pid: str, **kwargs) -> dict:
 
     # load html meta tags
     data = get_html_meta(soup)
-    print(data)
     # load site-specific metadata
     data |= web_translator(soup, url)
 
@@ -119,7 +118,6 @@ def get_schema_org(pid: str, **kwargs) -> dict:
         None,
     )
     if json_ld is not None:
-        print(json_ld)
         data |= json_ld
 
     # if @id is a DOI, get metadata from Crossref or DataCite
@@ -137,7 +135,6 @@ def get_schema_org(pid: str, **kwargs) -> dict:
     # author and creator are synonyms
     if data.get("author", None) is None and data.get("creator", None) is not None:
         data["author"] = data["creator"]
-    print(data)
     return data | {"via": "schema_org", "state": "findable"}
 
 

commonmeta/writers/inveniordm_writer.py

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

{commonmeta_py-0.68.dist-info → commonmeta_py-0.70.dist-info}/METADATA

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

{commonmeta_py-0.68.dist-info → commonmeta_py-0.70.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=adfgHsyzi0gQOYNT67ZTxtK5voYo3ROIL01tYfMCFKA,1875
+commonmeta/__init__.py,sha256=TAmXnOcVH9NyZ55JjhDdPqmZeJTJvPLQfYYU9_JtMBk,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
@@ -6,7 +6,7 @@ commonmeta/cli.py,sha256=sOI9BJTePnljVcXcZ95N7TKXDT283XpjUaak7bMnbr0,6076
 commonmeta/constants.py,sha256=AFm8gSo4WGnTdJOm1SOGLK602BctcQbaWU_tKCkgn_4,18087
 commonmeta/crossref_utils.py,sha256=qJlTZtfKR2shAXQDm8VBYUujKFkTtZTUz19GuMUANaI,22198
 commonmeta/date_utils.py,sha256=rJRV4YmWKQWU__iAV8www3cqwaefC0iRKyHwvxrr_XY,6316
-commonmeta/doi_utils.py,sha256=xlYQq-qkqhz07CLKpL_WfxZBT8maXgB9-TvQHlL2ZoY,9266
+commonmeta/doi_utils.py,sha256=s2J95V9rWPbGsh5oNXht3yJkJ0NmVLRlOXDPXjnN-Ck,9152
 commonmeta/metadata.py,sha256=cjvCcxW1FMtKCbNKan0zXX0FN6z5orHFGPYsgkp6fSI,12480
 commonmeta/readers/__init__.py,sha256=vOf7UsOKNoh_ZCuyexxhAmPMt8wjB-pF_CfpWRaN8pk,45
 commonmeta/readers/bibtex_reader.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -19,10 +19,10 @@ 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=G1q-Oq9keqBZYsWKtVE8EWr4rgQQYrNLMqKA7MSYXMg,13698
+commonmeta/readers/json_feed_reader.py,sha256=8C9tEH6KAh7nUWLW4myAXkhdMue-ViL9wqaajqb_B1s,13390
 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
+commonmeta/readers/schema_org_reader.py,sha256=iK71dvjK6oqYneJ51j4-qFmBh5G3pmjQMzt_U6tK9_o,17077
 commonmeta/resources/cff_v1.2.0.json,sha256=MpfjDYgX7fN9PLiG54ISZ2uu9WItNqfh-yaRuTf6Ptg,46691
 commonmeta/resources/commonmeta_v0.12.json,sha256=HUSNReXh2JN3Q6YWSt7CE69js8dh50OlpMYGTyU98oU,16762
 commonmeta/resources/commonmeta_v0.13.json,sha256=2-WSZGijR13zVu97S_YHXr-cyeLW7hzHXYMlr6nIjdw,15787
@@ -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=6N-93R1emcOsZrUTIhPBVd_Fv1C8Z5EAFYI0mYjoYaY,2797
 commonmeta/writers/datacite_writer.py,sha256=G7Lr0aZ4sAEdbfXe3dG4Y6AyGUKA9UWr_iiaQRDnV24,6233
-commonmeta/writers/inveniordm_writer.py,sha256=UeVLLx1SUcEOxaYdvOv8NhdbpISVD4nb48dNgDKW7ws,11403
+commonmeta/writers/inveniordm_writer.py,sha256=5U1_3pCXH2F5a3Jj8d3a-DiRBkGFZ4g4k9TD2JTgRqs,11427
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.68.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.68.dist-info/METADATA,sha256=LyOalGljP9ZbkF4pQI8oV623Nq3pCMgJfM2KYKqWby8,8279
-commonmeta_py-0.68.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.68.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.68.dist-info/RECORD,,
+commonmeta_py-0.70.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.70.dist-info/METADATA,sha256=8sjl96yizbRpmlRJ2GWPfPPd-ohZ_p0A2tGqYndTG7M,8279
+commonmeta_py-0.70.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.70.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.70.dist-info/RECORD,,