Merge upstream main: adapt #1231 fix for refactored architecture

Merged upstream/main which includes:
- fix: don't warn about tool.setuptools.dynamic.version when only using file finder (#1231)
- docs: update changelog for v9.2.2 patch release

Adapted the fix for our refactored architecture where:
- _check_setuptools_dynamic_version_conflict moved to setuptools-scm layer
- should_infer() converted from method to standalone function
- Conflict check now uses PyProjectData.definition field

Changes:
- Updated _check_setuptools_dynamic_version_conflict to only warn when should_infer() returns True
- Simplified function signature to take PyProjectData instead of separate parameters
- Fixed test to use should_infer(pyproject_data) function instead of method
- All pyproject reading tests pass

Author: RonnyPfannschmidt

setuptools-scm/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 <!-- towncrier release notes start -->
 
+## v9.2.2
+
+### Fixed
+
+- fix #1231: don't warn about `tool.setuptools.dynamic.version` when only using file finder.
+  The warning about combining version guessing with setuptools dynamic versions should only
+  be issued when setuptools-scm is performing version inference, not when it's only being
+  used for its file finder functionality.
+
+
 ## v9.2.1
 
 ### Fixed

setuptools-scm/src/setuptools_scm/_integration/pyproject_reading.py

@@ -87,15 +87,19 @@ def has_build_package_with_extra(
 
 
 def _check_setuptools_dynamic_version_conflict(
-    path: Path, build_requires: Sequence[str], definition: TOML_RESULT
+    path: Path, pyproject_data: PyProjectData
 ) -> None:
-    """Warn if tool.setuptools.dynamic.version conflicts with setuptools-scm."""
-    # Check if setuptools-scm[simple] is in build requirements
-    if not has_build_package_with_extra(build_requires, "setuptools-scm", "simple"):
+    """Warn if tool.setuptools.dynamic.version conflicts with setuptools-scm.
+
+    Only warns if setuptools-scm is being used for version inference (not just file finding).
+    When only file finders are used, it's valid to use tool.setuptools.dynamic.version.
+    """
+    # Only warn if setuptools-scm is performing version inference
+    if not should_infer(pyproject_data):
         return
 
     # Check if tool.setuptools.dynamic.version exists
-    tool = definition.get("tool", {})
+    tool = pyproject_data.definition.get("tool", {})
     if not isinstance(tool, dict):
         return
 
@@ -140,9 +144,7 @@ def read_pyproject(
 
     # Check for conflicting tool.setuptools.dynamic configuration
     # Use the definition from pyproject_data (read by vcs_versioning)
-    _check_setuptools_dynamic_version_conflict(
-        path, pyproject_data.build_requires, pyproject_data.definition
-    )
+    _check_setuptools_dynamic_version_conflict(path, pyproject_data)
 
     return pyproject_data
 

setuptools-scm/testing_scm/test_pyproject_reading.py

@@ -130,6 +130,7 @@ def test_read_pyproject_with_given_definition(monkeypatch: pytest.MonkeyPatch) -
 
 
 def test_read_pyproject_with_setuptools_dynamic_version_warns() -> None:
+    """Test that warning is issued when version inference is enabled."""
     with pytest.warns(
         UserWarning,
         match=r"pyproject\.toml: at \[tool\.setuptools\.dynamic\]",
@@ -146,3 +147,36 @@ def test_read_pyproject_with_setuptools_dynamic_version_warns() -> None:
             }
         )
     assert pyproject_data.project_version is None
+
+
+def test_read_pyproject_with_setuptools_dynamic_version_no_warn_when_file_finder_only() -> (
+    None
+):
+    """Test that no warning is issued when only file finder is used (no version inference)."""
+    # When setuptools-scm is used only for file finding (no [tool.setuptools_scm] section,
+    # no [simple] extra, version not in dynamic), it's valid to use tool.setuptools.dynamic.version
+    import warnings
+
+    with warnings.catch_warnings(record=True) as warning_list:
+        warnings.simplefilter("always")
+        pyproject_data = read_pyproject(
+            _given_definition={
+                "build-system": {"requires": ["setuptools-scm"]},
+                "project": {"name": "test-package", "version": "1.0.0"},
+                "tool": {
+                    "setuptools": {
+                        "dynamic": {"version": {"attr": "test_package.__version__"}}
+                    }
+                },
+            }
+        )
+
+    # Filter to check for the dynamic version warning specifically
+    relevant_warnings = [
+        w for w in warning_list if "tool.setuptools.dynamic" in str(w.message)
+    ]
+    assert len(relevant_warnings) == 0, (
+        "Should not warn about tool.setuptools.dynamic when only using file finder"
+    )
+    assert pyproject_data.project_version == "1.0.0"
+    assert not should_infer(pyproject_data)