From fb3994104f1bb88139b13cee55561a3ed17f63de Mon Sep 17 00:00:00 2001
From: mtkennerly <mtkennerly@gmail.com>
Date: Mon, 17 Jun 2024 17:25:22 -0400
Subject: [PATCH] Remove 'version' from 'dynamic' list as needed

---
 poetry_dynamic_versioning/__init__.py | 33 +++++++++++++++++++--------
 tests/test_integration.py             |  2 ++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/poetry_dynamic_versioning/__init__.py b/poetry_dynamic_versioning/__init__.py
index 95509e1..604a799 100644
--- a/poetry_dynamic_versioning/__init__.py
+++ b/poetry_dynamic_versioning/__init__.py
@@ -131,12 +131,14 @@ def __init__(
         original_version: Optional[str],
         version: str,
         mode: _Mode,
+        dynamic_index: Optional[int],
         substitutions: Optional[MutableMapping[Path, str]] = None,
     ) -> None:
         self.path = path
         self.original_version = original_version
         self.version = version
         self.mode = mode
+        self.dynamic_index = dynamic_index
         self.substitutions = (
             {} if substitutions is None else substitutions
         )  # type: MutableMapping[Path, str]
@@ -611,6 +613,7 @@ def _apply_version(
     if mode == _Mode.Classic:
         pyproject["tool"]["poetry"]["version"] = version  # type: ignore
     elif mode == _Mode.Pep621:
+        pyproject["project"]["dynamic"].remove("version")  # type: ignore
         pyproject["project"]["version"] = version  # type: ignore
 
     # Disable the plugin in case we're building a source distribution,
@@ -669,16 +672,22 @@ def _get_and_apply_version(
         and "poetry" in pyproject["tool"]
         and "name" in pyproject["tool"]["poetry"]
     )
-    pep621 = "project" in pyproject and "name" in pyproject["project"]
+    pep621 = (
+        "project" in pyproject
+        and "name" in pyproject["project"]
+        and "dynamic" in pyproject["project"]
+        and "version" in pyproject["project"]["dynamic"]
+        and "version" not in pyproject["project"]
+    )
 
     if classic:
         name = pyproject["tool"]["poetry"]["name"]
         original = pyproject["tool"]["poetry"]["version"]
+        dynamic_index = None
     elif pep621:
         name = pyproject["project"]["name"]
         original = pyproject["project"].get("version")
-        if "version" not in pyproject["project"].get("dynamic", []):
-            return name if name in _state.projects else None
+        dynamic_index = pyproject["project"]["dynamic"].index("version")
     else:
         return name if name in _state.projects else None
 
@@ -699,12 +708,16 @@ def _get_and_apply_version(
 
     if classic and name is not None and original is not None:
         mode = _Mode.Classic
-        _state.projects[name] = _ProjectState(pyproject_path, original, version, mode)
+        _state.projects[name] = _ProjectState(
+            pyproject_path, original, version, mode, dynamic_index
+        )
         if io:
             _apply_version(name, version, instance, config, pyproject_path, mode, retain)
     elif pep621 and name is not None:
         mode = _Mode.Pep621
-        _state.projects[name] = _ProjectState(pyproject_path, original, version, mode)
+        _state.projects[name] = _ProjectState(
+            pyproject_path, original, version, mode, dynamic_index
+        )
         if io:
             _apply_version(name, version, instance, config, pyproject_path, mode, retain)
 
@@ -733,11 +746,13 @@ def _revert_version(retain: bool = False) -> None:
             pyproject = tomlkit.parse(state.path.read_bytes().decode("utf-8"))
 
         if state.mode == _Mode.Classic:
-            pyproject["tool"]["poetry"]["version"] = state.original_version  # type: ignore
-        elif state.mode == _Mode.Pep621:
             if state.original_version is not None:
-                pyproject["project"]["version"] = state.original_version  # type: ignore
-            elif "version" in pyproject["project"]:  # type: ignore
+                pyproject["tool"]["poetry"]["version"] = state.original_version  # type: ignore
+        elif state.mode == _Mode.Pep621:
+            if state.dynamic_index is not None:
+                index = state.dynamic_index
+                pyproject["project"]["dynamic"].insert(index, "version")  # type: ignore
+            if "version" in pyproject["project"]:  # type: ignore
                 pyproject["project"].pop("version")  # type: ignore
 
         if not retain and not _state.cli_mode:
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 177932e..bdc0886 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -285,6 +285,7 @@ def test_pep621_with_dynamic_version():
     run("poetry-dynamic-versioning", where=DUMMY_PEP621)
     pyproject = tomlkit.parse(DUMMY_PEP621_PYPROJECT.read_bytes().decode("utf-8"))
     assert pyproject["project"]["version"] == version
+    assert "version" not in pyproject["project"]["dynamic"]
     assert f'__version__ = "{version}"' in (
         DUMMY_PEP621 / "project_pep621" / "__init__.py"
     ).read_bytes().decode("utf-8")
@@ -297,6 +298,7 @@ def test_pep621_with_dynamic_version_and_cleanup():
     run("poetry build", where=DUMMY_PEP621)
     pyproject = tomlkit.parse(DUMMY_PEP621_PYPROJECT.read_bytes().decode("utf-8"))
     assert "version" not in pyproject["project"]
+    assert "version" in pyproject["project"]["dynamic"]
     assert '__version__ = "0.0.0"' in (
         DUMMY_PEP621 / "project_pep621" / "__init__.py"
     ).read_bytes().decode("utf-8")