commonmeta-py 0.57__tar.gz → 0.59__tar.gz

{commonmeta_py-0.57 → commonmeta_py-0.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.57
+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.57 → commonmeta_py-0.59}/commonmeta/__init__.py

@@ -10,7 +10,7 @@ commonmeta-py is a Python library to convert scholarly metadata
 """
 
 __title__ = "commonmeta-py"
-__version__ = "0.57"
+__version__ = "0.59"
 __author__ = "Martin Fenner"
 __license__ = "MIT"
 

{commonmeta_py-0.57 → commonmeta_py-0.59}/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_py-0.57 → commonmeta_py-0.59}/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(
         {
@@ -250,7 +250,6 @@ def to_inveniordm_related_identifier(relation: dict) -> dict:
 
 def to_inveniordm_reference(reference: dict) -> dict:
     """Convert reference to inveniordm reference"""
-    print(reference)
     if normalize_doi(reference.get("id", None)):
         identifier = doi_from_url(reference.get("id", None))
         scheme = "doi"

{commonmeta_py-0.57 → commonmeta_py-0.59}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name="commonmeta-py"
-version="0.57"
+version="0.59"
 repository = "https://github.com/front-matter/commonmeta-py"
 homepage = "https://python.commonmeta.org"
 documentation = "https://python.commonmeta.org"
@@ -48,7 +48,7 @@ asyncclick = "^8.1.7.1"
 anyio = "^4.2.0"
 orjson = "^3.9.14"
 orjsonl = "^1.0.0"
-pikepdf = "^8.14.0"
+pikepdf = ">=8.14,<10.0"
 edtf = "^5.0.0"
 
 [tool.poetry.group.docs]