#137: Remove unnecessary version check

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Unreleased
+
+* Fixed:
+  * Running `poetry dynamic-versioning` followed by `poetry build`
+    would leave the plugin enabled in the sdist's pyproject.toml.
+
 ## v0.25.0 (2023-07-11)
 
 * Added:

poetry_dynamic_versioning/__init__.py

@@ -414,16 +414,15 @@ def _apply_version(
 ) -> None:
     pyproject = tomlkit.parse(pyproject_path.read_text(encoding="utf-8"))
 
-    if pyproject["tool"]["poetry"]["version"] != version:  # type: ignore
-        pyproject["tool"]["poetry"]["version"] = version  # type: ignore
+    pyproject["tool"]["poetry"]["version"] = version  # type: ignore
 
-        # Disable the plugin in case we're building a source distribution,
-        # which won't have access to the VCS info at install time.
-        # We revert this later when we deactivate.
-        if not retain and not _state.cli_mode:
-            pyproject["tool"]["poetry-dynamic-versioning"]["enable"] = False  # type: ignore
+    # Disable the plugin in case we're building a source distribution,
+    # which won't have access to the VCS info at install time.
+    # We revert this later when we deactivate.
+    if not retain and not _state.cli_mode:
+        pyproject["tool"]["poetry-dynamic-versioning"]["enable"] = False  # type: ignore
 
-        pyproject_path.write_bytes(tomlkit.dumps(pyproject).encode("utf-8"))
+    pyproject_path.write_bytes(tomlkit.dumps(pyproject).encode("utf-8"))
 
     name = pyproject["tool"]["poetry"]["name"]  # type: ignore
 
@@ -485,14 +484,13 @@ def _get_and_apply_version(
 
 def _revert_version(retain: bool = False) -> None:
     for project, state in _state.projects.items():
-        if state.original_version != state.version:
-            pyproject = tomlkit.parse(state.path.read_text(encoding="utf-8"))
-            pyproject["tool"]["poetry"]["version"] = state.original_version  # type: ignore
+        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
+        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.path.write_bytes(tomlkit.dumps(pyproject).encode("utf-8"))
 
         if state.substitutions:
             for file, content in state.substitutions.items():

tests/test_integration.py

@@ -3,10 +3,12 @@
 import shlex
 import shutil
 import subprocess
+import tarfile
 from pathlib import Path
 from typing import Optional, Sequence, Tuple
 
 import pytest
+import tomlkit
 
 ROOT = Path(__file__).parent.parent
 DIST = ROOT / "dist"
@@ -183,6 +185,17 @@ def test_cli_mode_and_substitution_without_enable():
     assert "<0.0.0>" not in (DUMMY / "project" / "__init__.py").read_text("utf8")
 
 
+def test_cli_mode_plus_build_will_disable_plugin():
+    run("poetry dynamic-versioning", where=DUMMY)
+    run("poetry build", where=DUMMY)
+    artifact = next(DUMMY_DIST.glob("*.tar.gz"))
+    with tarfile.open(artifact, "r:gz") as f:
+        item = "{}/pyproject.toml".format(artifact.name.replace(".tar.gz", ""))
+        content = f.extractfile(item).read()
+        parsed = tomlkit.parse(content)
+        assert parsed["tool"]["poetry-dynamic-versioning"]["enable"] is False
+
+
 def test_dependency_versions():
     run("poetry install", where=DUMMY)
     _, out = run("poetry run pip list --format freeze", where=DUMMY)