Merge pull request #1185 from RonnyPfannschmidt/fix-1181-version-keyword-doesnt-need-config

fix 1181 version keyword doesnt need config

Author: RonnyPfannschmidt

CHANGELOG.md

@@ -6,7 +6,8 @@
 ### Fixed
 
 - fix #1180: ensure version dumping works when no scm_version is given (problems in downstreams)
-
+- fix #1181: config - reintroduce controll over when we expect a section to be present
+             as it turns out theres valid use cases where setuptools_scm is not direct part of the dependencies
 
 ## v9.0.0
 

src/setuptools_scm/_config.py

@@ -271,6 +271,7 @@ def from_file(
         name: str | os.PathLike[str] = "pyproject.toml",
         dist_name: str | None = None,
         missing_file_ok: bool = False,
+        missing_section_ok: bool = False,
         **kwargs: Any,
     ) -> Configuration:
         """
@@ -279,10 +280,20 @@ def from_file(
                 not installed or the file has invalid format or does
                 not contain setuptools_scm configuration (either via
         _        [tool.setuptools_scm] section or build-system.requires).
+
+        Parameters:
+        - name: path to pyproject.toml
+        - dist_name: name of the distribution
+        - missing_file_ok: if True, do not raise an error if the file is not found
+        - missing_section_ok: if True, do not raise an error if the section is not found
+          (workaround for not walking the dependency graph when figuring out if setuptools_scm is a dependency)
+        - **kwargs: additional keyword arguments to pass to the Configuration constructor
         """
 
         try:
-            pyproject_data = _read_pyproject(Path(name))
+            pyproject_data = _read_pyproject(
+                Path(name), missing_section_ok=missing_section_ok
+            )
         except FileNotFoundError:
             if missing_file_ok:
                 log.warning("File %s not found, using empty configuration", name)

src/setuptools_scm/_integration/pyproject_reading.py

@@ -47,6 +47,7 @@ def read_pyproject(
     path: Path = Path("pyproject.toml"),
     tool_name: str = "setuptools_scm",
     build_package_names: Sequence[str] = ("setuptools_scm", "setuptools-scm"),
+    missing_section_ok: bool = False,
 ) -> PyProjectData:
     defn = read_toml_content(path)
     requires: list[str] = defn.get("build-system", {}).get("requires", [])
@@ -55,7 +56,7 @@ def read_pyproject(
     try:
         section = defn.get("tool", {})[tool_name]
     except LookupError as e:
-        if not is_required:
+        if not is_required and not missing_section_ok:
             # Enhanced error message that mentions both configuration options
             error = (
                 f"{path} does not contain a tool.{tool_name} section. "

src/setuptools_scm/_integration/setuptools.py

@@ -130,6 +130,7 @@ def version_keyword(
     config = _config.Configuration.from_file(
         dist_name=dist_name,
         missing_file_ok=True,
+        missing_section_ok=True,
         **overrides,
     )
     _assign_version(dist, config)

testing/test_integration.py

@@ -921,3 +921,35 @@ def test_integration_function_call_order(
     assert final_version == expected_final_version, (
         f"Expected version '{expected_final_version}' but got '{final_version}'"
     )
+
+
+def test_version_keyword_no_scm_dependency_works(
+    wd: WorkDir, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    # Set up a git repository with a tag
+    wd.commit_testfile("test")
+    wd("git tag 1.0.0")
+    monkeypatch.chdir(wd.cwd)
+
+    # Create a pyproject.toml file WITHOUT setuptools_scm in build-system.requires
+    # and WITHOUT [tool.setuptools_scm] section
+    pyproject_content = """
+[build-system]
+requires = ["setuptools>=80"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "test-package-no-scm"
+dynamic = ["version"]
+"""
+    wd.write("pyproject.toml", pyproject_content)
+
+    import setuptools
+
+    from setuptools_scm._integration.setuptools import version_keyword
+
+    # Create distribution
+    dist = setuptools.Distribution({"name": "test-package-no-scm"})
+
+    version_keyword(dist, "use_scm_version", True)
+    assert dist.metadata.version == "1.0.0"