use build for dist name

Author: ohmayr

.generator/cli.py

@@ -25,10 +25,9 @@
 import yaml
 from datetime import datetime
 from pathlib import Path
-from typing import Dict, List, Optional
-from distutils.core import run_setup
+from typing import Dict, List
 
-import tomli
+import build.util
 
 try:
     import synthtool
@@ -549,59 +548,22 @@ def _verify_library_namespace(library_id: str, repo: str):
             )
 
 
-def _get_setup_dist_name(library_id: str, repo: str) -> Optional[str]:
-    """Gets the library distribution name from a `setup.py` file.
-
-    Tries to execute `run_setup` on the file and extract the 'name'
-    property. Logs and returns None on any exception.
-
-    Args:
-        library_id(str): id of the library.
-        repo(str): This directory will contain all directories that make up a
-            library, the .librarian folder, and any global file declared in
-            the config.yaml.
-
-    Returns:
-        Optional[str]: The library distribution name if found and parsed, otherwise None.
+def _get_library_dist_name(library_id: str, repo: str) -> str:
     """
-    try:
-        dist = run_setup(f"{repo}/packages/{library_id}/setup.py")
-        return dist.get_name()
-    except Exception as e:
-        logger.debug(
-            f"failed to get distribution name for `{library_id}` from `setup.py` : {e}",
-            exc_info=True,
-        )
-        return None
-
-
-def _get_toml_dist_name(library_id: str, repo: str) -> Optional[str]:
-    """Gets the library distribution name from a `pyproject.toml` file.
-
-    Parses the TOML file and safely accesses the name from the
-    [project] table using `.get()`. Logs and returns None on any
-    exception (e.g., FileNotFoundError, TOMLDecodeError).
+    Gets the package name by programmatically building the metadata.
 
     Args:
-        library_id(str): id of the library.
-        repo(str): This directory will contain all directories that make up a
+        library_id: id of the library.
+        repo: This directory will contain all directories that make up a
             library, the .librarian folder, and any global file declared in
             the config.yaml.
 
     Returns:
-        Optional[str]: The library distribution name if found and parsed, otherwise None.
+        str: The library name string if found, otherwise None.
     """
-    try:
-        pyproject_toml_file = Path(f"{repo}/packages/{library_id}/pyproject.toml")
-        with open(pyproject_toml_file, "rb") as f:
-            data = tomli.load(f)
-            return data.get("project", {}).get("name")
-    except Exception as e:
-        logger.debug(
-            f"failed to get distribution name for `{library_id}` from `pyproject.toml` : {e}",
-            exc_info=True,
-        )
-        return None
+    library_path = f"{repo}/packages/{library_id}"
+    metadata = build.util.project_wheel_metadata(library_path)
+    return metadata.get("name")
 
 
 def _verify_library_dist_name(library_id: str, repo: str):
@@ -618,22 +580,12 @@ def _verify_library_dist_name(library_id: str, repo: str):
             the config.yaml.
 
     Raises:
-        ValueError: If no valid config file is found, or if a name
-            in an existing file does not match the `library_id`.
+        ValueError: If a name in an existing config file does not match the `library_id`.
     """
-    setup_dist_name = _get_setup_dist_name(library_id, repo)
-    toml_dist_name = _get_toml_dist_name(library_id, repo)
-    if setup_dist_name is None and toml_dist_name is None:
-        raise ValueError(
-            f"No valid `setup.py` or `pyproject.toml found for `{library_id}`."
-        )
-    if setup_dist_name is not None and setup_dist_name != library_id:
-        raise ValueError(
-            f"The distribution name `{setup_dist_name} in `setup.py` does not match folder `{library_id}`"
-        )
-    if toml_dist_name is not None and toml_dist_name != library_id:
+    dist_name = _get_library_dist_name(library_id, repo)
+    if dist_name != library_id:
         raise ValueError(
-            f"The distribution name `{toml_dist_name} in `pyproject.toml` does not match folder `{library_id}`"
+            f"The distribution name `{dist_name}` does not match the folder `{library_id}`."
         )
 
 

.generator/requirements-test.in

@@ -17,5 +17,3 @@ pytest-cov
 pytest-mock
 gcp-synthtool @ git+https://github.com/googleapis/synthtool@5aa438a342707842d11fbbb302c6277fbf9e4655
 starlark-pyo3>=2025.1
-# TODO(https://github.com/googleapis/google-cloud-python/issues/14443): tomli is part of the standard library for Python 3.11. Remove once we use 3.11+ for librarian.
-tomli

.generator/test_cli.py

@@ -37,12 +37,11 @@
     _copy_files_needed_for_post_processing,
     _create_main_version_header,
     _determine_bazel_rule,
+    _get_library_dist_name,
     _determine_library_namespace,
     _get_library_id,
     _get_libraries_to_prepare_for_release,
     _get_previous_version,
-    _get_setup_dist_name,
-    _get_toml_dist_name,
     _locate_and_extract_artifact,
     _process_changelog,
     _process_version_file,
@@ -926,66 +925,22 @@ def test_determine_library_namespace_fails_not_subpath():
         _determine_library_namespace(gapic_parent_path, pkg_root_path)
 
 
-def test_get_setup_dist_name_exists(mocker):
-    """Tests that a valid library distribution name exists in `pyproject.toml`."""
-    mock_dist = MagicMock()
-    mock_dist.get_name.return_value = "my-lib"
-    mocker.patch("cli.run_setup", return_value=mock_dist)
-    assert _get_setup_dist_name("my-lib", "repo") == "my-lib"
-
-
-def test_get_setup_dist_name_file_not_found(caplog):
-    """Tests that distribution name is None if `setup.py` does not exist."""
-    caplog.set_level(logging.DEBUG)
-    assert _get_setup_dist_name("my-lib", "repo") is None
-    assert len(caplog.records) == 1
-
-
-def test_get_toml_dist_name_exists(mocker):
-    """Tests that a valid library distribution name exists in `pyproject.toml`."""
-    mock_data = {"project": {"name": "my-lib"}}
-    mocker.patch("tomli.load", return_value=mock_data)
-    mocker.patch("builtins.open", mocker.mock_open(read_data=b"fake toml data"))
-    assert _get_toml_dist_name("my-lib", "repo") == "my-lib"
-
-
-def test_get_toml_dist_name_file_not_found(caplog):
-    """Tests that distribution name is None if `pyproject.toml` does not exist."""
-    caplog.set_level(logging.DEBUG)
-    assert _get_toml_dist_name("my-lib", "repo") is None
-    assert len(caplog.records) == 1
+def test_get_library_dist_name_success(mocker):
+    mock_metadata = {"name": "my-lib", "version": "1.0.0"}
+    mocker.patch("build.util.project_wheel_metadata", return_value=mock_metadata)
+    assert _get_library_dist_name("my-lib", "repo") == "my-lib"
 
 
 def test_verify_library_dist_name_setup_success(mocker):
     """Tests success when a library distribution name in setup.py is valid."""
-    mock_setup_file = mocker.patch("cli._get_setup_dist_name", return_value="my-lib")
+    mock_setup_file = mocker.patch("cli._get_library_dist_name", return_value="my-lib")
     _verify_library_dist_name("my-lib", "repo")
     mock_setup_file.assert_called_once_with("my-lib", "repo")
 
 
-def test_verify_library_dist_name_setup_success(mocker):
-    """Tests success when a library distribution name in toml is valid."""
-    mock_toml_file = mocker.patch("cli._get_toml_dist_name", return_value="my-lib")
-    _verify_library_dist_name("my-lib", "repo")
-    mock_toml_file.assert_called_once_with("my-lib", "repo")
-
-
-def test_verify_library_dist_name_fail():
-    """Tests failure when a library does not have a `setup.py` or `pyproject.toml`."""
-    with pytest.raises(ValueError):
-        _verify_library_dist_name("my-lib", "repo")
-
-
-def test_verify_library_dist_name_setup_fail(mocker):
-    """Tests failure when a library has an invalid distribution name in `setup.py`."""
-    mocker.patch("cli._get_setup_dist_name", return_value="invalid-lib-name")
-    with pytest.raises(ValueError):
-        _verify_library_dist_name("my-lib", "repo")
-
-
-def test_verify_library_dist_name_toml_fail(mocker):
-    """Tests failure when a library has an invalid distribution name in `pyproject.toml`."""
-    mocker.patch("cli._get_toml_dist_name", return_value="invalid-lib-name")
+def test_verify_library_dist_name_fail(mocker):
+    """Tests failure when a library-id does not match the libary distribution name."""
+    mocker.patch("cli._get_library_dist_name", return_value="invalid-lib")
     with pytest.raises(ValueError):
         _verify_library_dist_name("my-lib", "repo")