Merge pull request #37 from Materials-Data-Science-and-Informatics/monkeypatch_codemeta

fix: monkeypatch codemetapy 2.5.0 to fix poetry pyproject parsing

Author: mustafasoylu

README.md

@@ -143,9 +143,9 @@ Here is an overview of all the currently supported files and formats.
 
 | Input Formats  | Status | | Target Formats                | Status |
 | -------------- | ------ |-| ----------------------------- | ------ |
-| (.)somesy.toml | ✓      | | pyproject.toml _(poetry)_     | ✓      |
-| pyproject.toml | ✓(1.)  | | pyproject.toml _(setuptools)_ | ✓(2.)  |
-| package.json   | TBD    | | package.json                  | TBD    |
+| (.)somesy.toml | ✓      | | pyproject.toml _(poetry)_       | ✓      |
+| pyproject.toml | ✓(1.)  | | pyproject.toml _(setuptools)_   | ✓(2.)  |
+| package.json   | ✓      | | package.json                  | ✓      |
 |                |        | | mkdocs.yml                    | TBD    |
 |                |        | | CITATION.cff                  | ✓      |
 |                |        | | codemeta.json                 | ✓(3.)  |

codemeta.json

@@ -49,14 +49,14 @@
             "identifier": "'version':",
             "name": "'version':",
             "runtimePlatform": "Python 3",
-            "version": "'^1.9.2'}"
+            "version": "'^0.7.0'}"
         },
         {
             "@type": "SoftwareApplication",
             "identifier": "'version':",
             "name": "'version':",
             "runtimePlatform": "Python 3",
-            "version": "'^0.7.0'}"
+            "version": "'^1.9.2'}"
         },
         {
             "@type": "SoftwareApplication",
@@ -70,7 +70,7 @@
             "identifier": "codemetapy",
             "name": "codemetapy",
             "runtimePlatform": "Python 3",
-            "version": "{'git': 'https://github.com/proycon/codemetapy.git'}"
+            "version": "^2.5.0"
         },
         {
             "@type": "SoftwareApplication",

docs/manual.md

@@ -305,4 +305,4 @@ everybody's life easier. Furthermore, nobody needs to care whether, under the
 hood, you use `somesy` (or anything like it) or not - they can use the
 corresponding files they already know to get the information they need.
 So there is no "risk" involved in adopting `somesy`, because it does not try to
-abolish any other formats or standards or becoming such.
+abolish any other formats or standards or becoming such.

poetry.lock

@@ -44,8 +44,7 @@ cffconvert = "^2.0.0"
 wrapt = "^1.15.0"
 packaging = "^23.1"
 rdflib = "^6.3.2"
-codemetapy = { git = "https://github.com/proycon/codemetapy.git" }
-# codemetapy = "^2.5.1" # TODO: use once released
+codemetapy = "^2.5.0"
 
 [tool.poetry.group.dev.dependencies]
 poethepoet = "^0.18.1"

pyproject.toml

@@ -3,13 +3,38 @@
 import logging
 from pathlib import Path
 
+from importlib_metadata import version
+
 from ..core.models import SomesyConfig
 from .exec import gen_codemeta
 from .utils import cff_codemeta_tempfile, update_codemeta_file
 
 log = logging.getLogger("somesy")
 
 
+def patch_codemetapy():
+    """Monkey-patch codemetapy (2.5.0 -> 2.5.1)."""
+    # TODO: remove once codemeta update is published)
+    if version("codemetapy") != "2.5.0":
+        return
+    from codemeta.parsers import python as cmpy
+
+    # https://github.com/proycon/codemetapy/blob/88098dc638e4cdfed9de6ad98002e16dfeede952/codemeta/parsers/python.py
+    def fixed_metadata_from_pyproject(pyproject):
+        """Parse metadata from pyproject.toml."""
+        if pyproject.project and "name" in pyproject.project:
+            return pyproject.project
+        elif "poetry" in pyproject.tool:
+            return pyproject.tool["poetry"]
+        elif pyproject.tool and "name" in list(pyproject.tool.values())[0]:
+            # fallback: no poetry but another tool that defines at least a name
+            return list(pyproject.tool.values())[0]
+        return None
+
+    cmpy.metadata_from_pyproject = fixed_metadata_from_pyproject
+    log.debug("monkeypatch codemetapy 2.5.0 -> 2.5.1")
+
+
 def collect_cm_sources(conf: SomesyConfig):
     """Assemble list of inputs for codemetapy based on somesy config.
 
@@ -38,6 +63,7 @@ def update_codemeta(conf: SomesyConfig) -> bool:
 
     Returns True if file has been written, False if it was up to date.
     """
+    patch_codemetapy()
     cm_sources = collect_cm_sources(conf)
 
     # if cff file is given, convert it to codemeta tempfile and pass as extra input