#150: Revert substitutions before specific pyproject.toml fields

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Unreleased
+
+* Fixed:
+  * Custom substitutions in pyproject.toml weren't cleaned up correctly.
+    This was because the plugin would record the "original" content of the file
+    after the `version` and `enable` fields had already been changed.
+    Now, substitutions are reverted first before reverting `version` and `enable`.
+
 ## v1.1.0 (2023-10-01)
 
 * Added:

poetry_dynamic_versioning/__init__.py

@@ -498,12 +498,6 @@ def _get_and_apply_version(
 def _revert_version(retain: bool = False) -> None:
     for project, state in _state.projects.items():
         pyproject = tomlkit.parse(state.path.read_text(encoding="utf-8"))
-        pyproject["tool"]["poetry"]["version"] = state.original_version  # type: ignore
-
-        if not retain and not _state.cli_mode:
-            pyproject["tool"]["poetry-dynamic-versioning"]["enable"] = True  # type: ignore
-
-        state.path.write_bytes(tomlkit.dumps(pyproject).encode("utf-8"))
 
         if state.substitutions:
             config = _get_config(pyproject)
@@ -519,4 +513,14 @@ def _revert_version(retain: bool = False) -> None:
 
                 file.write_bytes(content.encode("utf-8"))
 
+            # Reread pyproject.toml in case the substitutions affected it.
+            pyproject = tomlkit.parse(state.path.read_text(encoding="utf-8"))
+
+        pyproject["tool"]["poetry"]["version"] = state.original_version  # type: ignore
+
+        if not retain and not _state.cli_mode:
+            pyproject["tool"]["poetry-dynamic-versioning"]["enable"] = True  # type: ignore
+
+        state.path.write_bytes(tomlkit.dumps(pyproject).encode("utf-8"))
+
     _state.projects.clear()