Get name and version from pyproject in _get_and_apply_version

mtkennerly · May 23, 2024 · 512ab91 · 512ab91
1 parent 837d3d0
commit 512ab91
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/poetry_dynamic_versioning/__init__.py b/poetry_dynamic_versioning/__init__.py
@@ -633,16 +633,23 @@ def _apply_version(
 
 
 def _get_and_apply_version(
-    name: Optional[str] = None,
-    original: Optional[str] = None,
-    pyproject: Optional[Mapping] = None,
+    pyproject: Mapping,
     pyproject_path: Optional[Path] = None,
     retain: bool = False,
     force: bool = False,
     # fmt: off
     io: bool = True
     # fmt: on
 ) -> Optional[str]:
+    poetry_section = pyproject.get("tool", {}).get("poetry", {})
+    project_section = pyproject.get("project", {})
+
+    name = poetry_section.get("name") or project_section.get("name")
+    original = poetry_section.get("version")
+
+    if not original:
+        raise RuntimeError("No version found in section 'tool.poetry'")
+
     if name is not None and name in _state.projects:
         return name
 

diff --git a/poetry_dynamic_versioning/plugin.py b/poetry_dynamic_versioning/plugin.py
@@ -81,10 +81,7 @@ def _apply_version_via_plugin(
     io: bool = True
     # fmt: on
 ) -> None:
-    project_section = poetry.pyproject.data.get("project", {})
     name = _get_and_apply_version(
-        name=poetry.local_config.get("name") or project_section.get("name"),
-        original=poetry.local_config["version"],
         pyproject=poetry.pyproject.data,
         pyproject_path=_get_pyproject_path_from_poetry(poetry.pyproject),
         retain=retain,