commonmeta-py 0.49__tar.gz → 0.51__tar.gz

{commonmeta_py-0.49 → commonmeta_py-0.51}/PKG-INFO

@@ -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 → commonmeta_py-0.51}/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_py-0.49 → commonmeta_py-0.51}/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_py-0.49 → commonmeta_py-0.51}/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 → commonmeta_py-0.51}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name="commonmeta-py"
-version="0.49"
+version="0.51"
 repository = "https://github.com/front-matter/commonmeta-py"
 homepage = "https://python.commonmeta.org"
 documentation = "https://python.commonmeta.org"
@@ -12,7 +12,7 @@ license = "MIT"
 packages = [{include = "commonmeta"}]
 
 [tool.poetry.dependencies]
-python = ">=3.9,<4.0.0"
+python = ">=3.9,<3.13"
 docutils = "^0.19"
 setuptools = "^70.0"
 sphinxcontrib-issuetracker = "^0.11"
@@ -38,9 +38,6 @@ types-xmltodict = "^0.13"
 nameparser = "^1.1.2"
 pycountry = "^23.12.11"
 click = "^8.1.7"
-quartodoc = "^0.7.1"
-jupyterlab = "^4.0.9"
-jupyterlab-quarto = "^0.2.8"
 furl = "^2.1.3"
 lxml = ">=4.8"
 python-dateutil = "^2.8.2"
@@ -52,6 +49,15 @@ anyio = "^4.2.0"
 orjson = "^3.9.14"
 orjsonl = "^1.0.0"
 pikepdf = "^8.14.0"
+edtf = "^4.0.1"
+
+[tool.poetry.group.docs]
+optional = true
+
+[tool.poetry.group.docs.dependencies]
+quartodoc = "^0.7.1"
+jupyterlab = "^4.0.9"
+jupyterlab-quarto = "^0.2.8"
 
 [tool.poetry.scripts]
 commonmeta = "commonmeta.cli:cli"