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

commonmeta/utils.py

@@ -1092,16 +1092,24 @@ def name_to_fos(name: str) -> Optional[dict]:
     return {"subject": subject}
 
 
-def encode_doi(prefix):
+def encode_doi(prefix, number: Optional[int]= None, checksum: bool = True) -> str:
     """Generate a DOI using the DOI prefix and a random base32 suffix"""
-    suffix = base32.generate(length=10, split_every=5, checksum=True)
+    if isinstance(number, int):
+        suffix = base32.encode(number, split_every=5, checksum=checksum)
+    else:
+        suffix = base32.generate(length=10, split_every=5, checksum=True)
     return f"https://doi.org/{prefix}/{suffix}"
 
 
-def decode_doi(doi: str) -> int:
+def decode_doi(doi: str, checksum: bool = True) -> int:
     """Decode a DOI to a number"""
-    suffix = doi.split("/", maxsplit=5)[-1]
-    return base32.decode(suffix)
+    try:
+        suffix = doi.split("/", maxsplit=5)[-1]
+        if checksum:
+            return base32.decode(suffix, checksum=True)
+        return base32.decode(suffix)
+    except ValueError:
+        return 0
 
 
 def from_curie(id: Optional[str]) -> Optional[str]:

commonmeta/writers/inveniordm_writer.py

@@ -38,7 +38,7 @@ def write_inveniordm(metadata):
             ),
         }
         for i in wrap(metadata.identifiers)
-        if i.get("identifier", None) != metadata.id
+        if i.get("identifierType", None) != "DOI"
     ]
     identifiers.append(
         {

{commonmeta_py-0.58.dist-info → commonmeta_py-0.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.58
+Version: 0.59
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT
@@ -38,7 +38,7 @@ Requires-Dist: nbstripout (>=0.6,<0.7)
 Requires-Dist: nh3 (>=0.2.14,<0.3.0)
 Requires-Dist: orjson (>=3.9.14,<4.0.0)
 Requires-Dist: orjsonl (>=1.0.0,<2.0.0)
-Requires-Dist: pikepdf (>=8.14.0,<9.0.0)
+Requires-Dist: pikepdf (>=8.14,<10.0)
 Requires-Dist: pycountry (>=23.12.11,<24.0.0)
 Requires-Dist: pydash (>=7.0,<8.0)
 Requires-Dist: pyjwt (>=2.8.0,<3.0.0)

{commonmeta_py-0.58.dist-info → commonmeta_py-0.59.dist-info}/RECORD

@@ -1,4 +1,4 @@
-commonmeta/__init__.py,sha256=3ZE2nD2nrsDhNQQfX4SsQmIATcGbzmZwJGNYhQG9YQA,1779
+commonmeta/__init__.py,sha256=kL83VEVl38LcgVgjuTDvDYC__UV6MEZRL0du12sjL20,1779
 commonmeta/api_utils.py,sha256=-ZHGVZZhJqnjnsLtp4-PoeHYbDqL0cQme7W70BEjo4U,2677
 commonmeta/author_utils.py,sha256=zBIPTgP5n7Zx57xomJ2h7x0dvC0AV8gJ2gPoYeDy5Lo,8348
 commonmeta/base_utils.py,sha256=AsUElA5kT2fw_Osy7Uaj2F6MKeq9yB7d5f2V-h2lh7c,3750
@@ -58,7 +58,7 @@ commonmeta/resources/styles/modern-language-association.csl,sha256=HI2iU4krze1aH
 commonmeta/resources/styles/vancouver.csl,sha256=lun3_i2oTilgsANk4LjFao2UDPQlGj_hgFgKAWC_DF8,12878
 commonmeta/schema_utils.py,sha256=gg3l1jd_lFtRkQlO1DYGMVbC10nEmVTN4AWacxC4AAE,915
 commonmeta/translators.py,sha256=RpGJtKNLjmz41VREZDY7KyyE2eXOi8j7m-da4jHmknI,1362
-commonmeta/utils.py,sha256=YaKAWk37DQ1-gSk9QK5s9Pm7B7jIlmaO_Vd--3HBK1o,44066
+commonmeta/utils.py,sha256=S3uzmQLzY7W-I7t0GSm-9WbILb0IcfWYU7thHmE4_Hk,44401
 commonmeta/writers/__init__.py,sha256=47-snms6xBHkoEXKYV1DBtH1npAtlVtvY29Z4Zr45qI,45
 commonmeta/writers/bibtex_writer.py,sha256=s3hIJIgWvSG7TAriZMRQEAyuitw6ebwWSI1YcYFQ-do,4971
 commonmeta/writers/citation_writer.py,sha256=RjaNh9EALxq6gfODLRWVJxGxPArGd6ZiHUlkYnCT6MA,2355
@@ -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=jjYbhgEUjb8Y0SqVbmw6af8BFtlt7CdHhXKbYO3kpu0,11401
+commonmeta/writers/inveniordm_writer.py,sha256=oVcXdHYtuugbfDgKO8JwTRXmP7AK2U96uK4YF0eKXAY,11399
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.58.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.58.dist-info/METADATA,sha256=vml1cVguS9ID_DrMSLbZTfyUeQaRnvXYUwkBw8jaOQ4,8282
-commonmeta_py-0.58.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-commonmeta_py-0.58.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.58.dist-info/RECORD,,
+commonmeta_py-0.59.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.59.dist-info/METADATA,sha256=BP49AZs8BJ6GIPnRbieOEomK9qfvrfWlQAzALU6F55A,8279
+commonmeta_py-0.59.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.59.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.59.dist-info/RECORD,,