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

commonmeta/date_utils.py

@@ -3,6 +3,8 @@ import datetime
 from datetime import datetime as dt
 from typing import Optional, Union
 import dateparser
+from edtf import parse_edtf, DateAndTime, Date
+from edtf.parser.edtf_exceptions import EDTFParseException
 import pydash as py_
 
 from .base_utils import compact
@@ -191,3 +193,17 @@ def normalize_date_dict(data: dict) -> dict:
             "withdrawn": data.get("Withdrawn", None),
         }
     )
+
+
+def validate_edtf(iso8601_time: Optional[str]) -> Optional[str]:
+    """Validate EDTF string using edtf. Return None if invalid"""
+    if iso8601_time is None:
+        return None
+    try:
+        edtf = parse_edtf(iso8601_time)
+    except EDTFParseException as e:
+        print(e)
+        return None
+    if not isinstance(edtf, (DateAndTime, Date)):
+        return None
+    return edtf.isoformat()

commonmeta/writers/inveniordm_writer.py

@@ -2,10 +2,9 @@
 
 import orjson as json
 from typing import Optional
-from furl import furl
 
 from ..base_utils import compact, wrap, parse_attributes, presence
-from ..date_utils import get_iso8601_date
+from ..date_utils import get_iso8601_date, validate_edtf
 from ..doi_utils import doi_from_url, normalize_doi
 from ..constants import (
     CM_TO_INVENIORDM_TRANSLATIONS,
@@ -78,12 +77,15 @@ def write_inveniordm(metadata):
     )
     dates = []
     if metadata.date.get("updated", None):
-        dates.append(
-            {
-                "date": metadata.date.get("updated"),
-                "type": {"id": "updated"},
-            }
-        )
+        # workaround for InvenioRDM issue parsing some iso8601 strings
+        date_updated = validate_edtf(metadata.date.get("updated"))
+        if date_updated:
+            dates.append(
+                {
+                    "date": metadata.date.get("updated"),
+                    "type": {"id": "updated"},
+                }
+            )
 
     subjects = [to_inveniordm_subject(i) for i in wrap(metadata.subjects)]
     data = compact(
@@ -305,3 +307,5 @@ def to_inveniordm_funding(funding: dict) -> Optional[dict]:
             ),
         }
     )
+
+

{commonmeta_py-0.49.dist-info → commonmeta_py-0.51.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: commonmeta-py
-Version: 0.49
+Version: 0.51
 Summary: Library for conversions to/from the Commonmeta scholarly metadata format
 Home-page: https://python.commonmeta.org
 License: MIT
 Keywords: science,metadata,commonmeta,bibtex,csl,crossref,datacite
 Author: Martin Fenner
 Author-email: martin@front-matter.io
-Requires-Python: >=3.9,<4.0.0
+Requires-Python: >=3.9,<3.13
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
@@ -27,11 +27,10 @@ Requires-Dist: click (>=8.1.7,<9.0.0)
 Requires-Dist: datacite (>=1.1,<2.0)
 Requires-Dist: dateparser (>=1.1.7,<2.0.0)
 Requires-Dist: docutils (>=0.19,<0.20)
+Requires-Dist: edtf (>=4.0.1,<5.0.0)
 Requires-Dist: furl (>=2.1.3,<3.0.0)
 Requires-Dist: httpx (>=0.27,<0.28)
 Requires-Dist: jsonschema (>=4.21,<5.0)
-Requires-Dist: jupyterlab (>=4.0.9,<5.0.0)
-Requires-Dist: jupyterlab-quarto (>=0.2.8,<0.3.0)
 Requires-Dist: lxml (>=4.8)
 Requires-Dist: nameparser (>=1.1.2,<2.0.0)
 Requires-Dist: nbstripout (>=0.6,<0.7)
@@ -43,7 +42,6 @@ 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)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)
-Requires-Dist: quartodoc (>=0.7.1,<0.8.0)
 Requires-Dist: setuptools (>=70.0,<71.0)
 Requires-Dist: simplejson (>=3.18,<4.0)
 Requires-Dist: sphinx-autodoc-typehints (>=1.19,<2.0)

{commonmeta_py-0.49.dist-info → commonmeta_py-0.51.dist-info}/RECORD

@@ -1,11 +1,11 @@
-commonmeta/__init__.py,sha256=Kx4b9TU_BjS3DqrXMtx7y5hGIjdt3pwv6BgYkZWZHr8,1779
+commonmeta/__init__.py,sha256=2IjFYKV3lYxGb467A96saENnrKUVd-CUR785uUOJf9U,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
 commonmeta/cli.py,sha256=0IJF1SQ1sKPg7M0Gb8fpX2nBps-G0L13o01__M6c5Z0,6104
 commonmeta/constants.py,sha256=VfjXLkwoV4A5uztH3vgDJ_qrt7PaWGO6QtHbAt4r03c,17501
 commonmeta/crossref_utils.py,sha256=qJlTZtfKR2shAXQDm8VBYUujKFkTtZTUz19GuMUANaI,22198
-commonmeta/date_utils.py,sha256=amF3E0ZJlh8yY5eY3aVXQyAO1x2WuZHJXw-ajOEcdUQ,5808
+commonmeta/date_utils.py,sha256=rJRV4YmWKQWU__iAV8www3cqwaefC0iRKyHwvxrr_XY,6316
 commonmeta/doi_utils.py,sha256=Dt6K9ADD2ga2WNsOzfX9f29gnubhn7xqeKL7U5pEpBs,8209
 commonmeta/metadata.py,sha256=cjvCcxW1FMtKCbNKan0zXX0FN6z5orHFGPYsgkp6fSI,12480
 commonmeta/readers/__init__.py,sha256=vOf7UsOKNoh_ZCuyexxhAmPMt8wjB-pF_CfpWRaN8pk,45
@@ -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=L79kjpcV4s6poWfAoxHipxQ2Fb9MlUdK-dA-xqLb2kU,9812
+commonmeta/writers/inveniordm_writer.py,sha256=UMFjUC_uvF8Bkm-Le5mR_nDolagqr9M6XTUH-x2sxYc,9994
 commonmeta/writers/ris_writer.py,sha256=AcnCszS3WY9lF594NbFBtLylsA8ownnYp_XLQJ84Ios,2093
 commonmeta/writers/schema_org_writer.py,sha256=5j002uCNLdlScZMNQmPjodcVWqaBh2z38zL1H4lo2hY,5741
-commonmeta_py-0.49.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
-commonmeta_py-0.49.dist-info/METADATA,sha256=B6Tdzmp8Sp69PMFnUeYFuToBU1sPt9pLZ2ksDAeu3Ko,8331
-commonmeta_py-0.49.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-commonmeta_py-0.49.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
-commonmeta_py-0.49.dist-info/RECORD,,
+commonmeta_py-0.51.dist-info/LICENSE,sha256=746hEF2wZCKkcckk5-_DcBLtHewfaEMS4iXTlA1PVwk,1074
+commonmeta_py-0.51.dist-info/METADATA,sha256=WokZ3me1CLd4fkL8Pc6DJON2SjCDbe9kVMtP4gRRyPM,8232
+commonmeta_py-0.51.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+commonmeta_py-0.51.dist-info/entry_points.txt,sha256=vbcDw3_2lMTKdcAL2VUF4DRYRpKuzXVYLMCdgKVf88U,49
+commonmeta_py-0.51.dist-info/RECORD,,

{commonmeta_py-0.49.dist-info → commonmeta_py-0.51.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any