simplify version inference logic tree

Author: RonnyPfannschmidt

src/setuptools_scm/_integration/version_inference.py

@@ -114,62 +114,49 @@ def get_version_inference_config(
     Returns:
         VersionInferenceResult with the decision and configuration
     """
+    # Normalize name from project metadata when not provided
     if dist_name is None:
         dist_name = pyproject_data.project_name
 
-    # Handle version already set
+    # If a version is already present, decide based on context (infer_version vs version_keyword)
     if current_version is not None:
-        if was_set_by_infer:
-            if overrides is not None and overrides:
-                # Clear version and proceed with actual overrides (non-empty dict)
-                return VersionInferenceConfig(
-                    dist_name=dist_name,
-                    pyproject_data=pyproject_data,
-                    overrides=overrides,
-                )
-            else:
-                # Keep existing version from infer_version (no overrides or empty overrides)
-                # But allow re-inferring if this is another infer_version call
-                if overrides is None:
-                    # This is another infer_version call, allow it to proceed
-                    return VersionInferenceConfig(
-                        dist_name=dist_name,
-                        pyproject_data=pyproject_data,
-                        overrides=overrides,
-                    )
-                else:
-                    # This is version_keyword with empty overrides, keep existing version
-                    return VersionInferenceNoOp()
-        else:
-            # Version set by something else
+        # infer_version call (overrides is None) should be a no-op if version already exists
+        if overrides is None:
+            return VersionInferenceNoOp()
+
+        if not was_set_by_infer:
             return VersionInferenceError(
-                f"version of {dist_name} already set", should_warn=True
+                f"version of {dist_name} already set",
+                should_warn=pyproject_data.should_infer(),
             )
 
-    # Handle setuptools-scm package
+        # Version was set by infer_version previously
+        if overrides:
+            # Non-empty overrides from version_keyword → re-infer with overrides
+            return VersionInferenceConfig(
+                dist_name=dist_name, pyproject_data=pyproject_data, overrides=overrides
+            )
+        # Empty overrides dict from version_keyword → keep existing version
+        return VersionInferenceNoOp()
+
+    # Do not infer a version for setuptools-scm itself
     if dist_name == "setuptools-scm":
         return VersionInferenceNoOp()
 
-    # version_keyword (with overrides) always tries to infer
+    # version_keyword path: any overrides (empty or not) mean we should infer
     if overrides is not None:
         return VersionInferenceConfig(
-            dist_name=dist_name,
-            pyproject_data=pyproject_data,
-            overrides=overrides,
+            dist_name=dist_name, pyproject_data=pyproject_data, overrides=overrides
         )
 
-    # infer_version (no overrides) uses pyproject configuration to decide
+    # infer_version path: decide based on pyproject configuration only
     try:
-        should_proceed = pyproject_data.should_infer()
+        if pyproject_data.should_infer():
+            return VersionInferenceConfig(
+                dist_name=dist_name, pyproject_data=pyproject_data, overrides=None
+            )
     except ValueError:
-        # For infer_version, silently skip on configuration issues (auto-activation shouldn't error)
+        # Auto-activation should not error in infer_version context → skip silently
         return VersionInferenceNoOp()
 
-    if should_proceed:
-        return VersionInferenceConfig(
-            dist_name=dist_name,
-            pyproject_data=pyproject_data,
-            overrides=overrides,
-        )
-    else:
-        return VersionInferenceNoOp()
+    return VersionInferenceNoOp()

testing/test_version_inference.py

@@ -26,7 +26,7 @@ def test_version_already_set_by_infer_with_overrides(self) -> None:
         assert result.overrides == {"key": "value"}
 
     def test_version_already_set_by_infer_no_overrides(self) -> None:
-        """Test that we allow re-inferring when version was set by infer_version and overrides=None (another infer_version call)."""
+        """infer_version call with existing version should be a no-op."""
         result = get_version_inference_config(
             dist_name="test_package",
             current_version="1.0.0",
@@ -35,9 +35,7 @@ def test_version_already_set_by_infer_no_overrides(self) -> None:
             was_set_by_infer=True,
         )
 
-        assert isinstance(result, VersionInferenceConfig)
-        assert result.dist_name == "test_package"
-        assert result.overrides is None
+        assert isinstance(result, VersionInferenceNoOp)
 
     def test_version_already_set_by_infer_empty_overrides(self) -> None:
         """Test that we don't re-infer when version was set by infer_version with empty overrides (version_keyword call)."""
@@ -52,7 +50,7 @@ def test_version_already_set_by_infer_empty_overrides(self) -> None:
         assert isinstance(result, VersionInferenceNoOp)
 
     def test_version_already_set_by_something_else(self) -> None:
-        """Test that we return error when version was set by something else."""
+        """infer_version call with existing version set by something else should be a no-op."""
         result = get_version_inference_config(
             dist_name="test_package",
             current_version="1.0.0",
@@ -61,9 +59,7 @@ def test_version_already_set_by_something_else(self) -> None:
             was_set_by_infer=False,
         )
 
-        assert isinstance(result, VersionInferenceError)
-        assert result.message == "version of test_package already set"
-        assert result.should_warn is True
+        assert isinstance(result, VersionInferenceNoOp)
 
     def test_setuptools_scm_package(self) -> None:
         """Test that we don't infer for setuptools-scm package itself."""
@@ -190,7 +186,7 @@ def test_none_dist_name(self) -> None:
         assert result.dist_name is None
 
     def test_version_already_set_none_dist_name(self) -> None:
-        """Test that we handle None dist_name in error case."""
+        """infer_version call with None dist_name and existing version should be a no-op."""
         result = get_version_inference_config(
             dist_name=None,
             current_version="1.0.0",
@@ -199,8 +195,7 @@ def test_version_already_set_none_dist_name(self) -> None:
             was_set_by_infer=False,
         )
 
-        assert isinstance(result, VersionInferenceError)
-        assert result.message == "version of None already set"
+        assert isinstance(result, VersionInferenceNoOp)
 
     def test_overrides_passed_through(self) -> None:
         """Test that overrides are passed through to the config."""