Merge branch 'main' into onboard-grpc-google-iam-v1

Author: parthea

.generator/Dockerfile

@@ -39,7 +39,7 @@ RUN apt-get update && \
 # Install multiple Python versions from source. `make altinstall` is used to
 # prevent replacing the system's default python binary.
 # TODO(http://github.com/googleapis/gapic-generator-python/issues/2435): Remove `3.10.18` when the linked issue is resolved.
-RUN for PYTHON_VERSION in 3.9.23 3.10.18 3.13.7; do \
+RUN for PYTHON_VERSION in 3.9.23 3.10.18 3.13.7 3.14.0; do \
     wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz && \
     tar -xvf Python-${PYTHON_VERSION}.tgz && \
     cd Python-${PYTHON_VERSION} && \
@@ -53,7 +53,7 @@ RUN for PYTHON_VERSION in 3.9.23 3.10.18 3.13.7; do \
 # Install pip for each python version
 # TODO(http://github.com/googleapis/gapic-generator-python/issues/2435): Remove `3.10` when the linked issue is resolved.
 RUN wget --no-check-certificate -O /tmp/get-pip.py 'https://bootstrap.pypa.io/get-pip.py' && \
-    for PYTHON_VERSION in 3.9 3.10 3.13; do \
+    for PYTHON_VERSION in 3.9 3.10 3.13 3.14; do \
         python${PYTHON_VERSION} /tmp/get-pip.py; \
     done && \
     rm /tmp/get-pip.py
@@ -67,8 +67,10 @@ RUN unzip protoc-25.3-linux-x86_64.zip -d protoc
 
 # Download/extract pandoc
 # Pandoc is required by gapic-generator-python for parsing documentation
-RUN wget https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-amd64.tar.gz
-RUN tar -xvf pandoc-3.7.0.2-linux-amd64.tar.gz
+ENV PANDOC_VERSION=3.8.2
+RUN mkdir pandoc-binary
+RUN wget https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz
+RUN tar -xvf pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz -C pandoc-binary --strip-components=1
 
 # Download synthtool
 RUN git clone --depth 1 https://github.com/googleapis/synthtool.git synthtool
@@ -86,9 +88,6 @@ ENV SYNTHTOOL_TEMPLATES="/synthtool/synthtool/gcp/templates"
 # These are the non "-dev" versions of the libraries used in the builder.
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
-    # Temporarily include git and ca-certificates to download gapic-generator from Github
-    ca-certificates \
-    git \
     # This is needed to avoid the following error:
     # `ImportError: libsqlite3.so.0: cannot open shared object file: No such file or directory`.
     # `libsqlite3-0` is used by the `coverage` PyPI package which is used when testing libraries
@@ -101,7 +100,7 @@ RUN apt-get update && \
 COPY --from=builder protoc/bin /usr/local/bin
 COPY --from=builder protoc/include /usr/local/include
 
-COPY --from=builder pandoc-3.7.0.2/bin /usr/local/bin
+COPY --from=builder pandoc-binary/bin /usr/local/bin
 COPY --from=builder synthtool /synthtool
 
 # Copy all Python interpreters, their pip executables, and their standard libraries from the builder.
@@ -115,6 +114,9 @@ COPY --from=builder /usr/local/lib/python3.10 /usr/local/lib/python3.10
 COPY --from=builder /usr/local/bin/python3.13 /usr/local/bin/
 COPY --from=builder /usr/local/lib/python3.13 /usr/local/lib/python3.13
 
+COPY --from=builder /usr/local/bin/python3.14 /usr/local/bin/
+COPY --from=builder /usr/local/lib/python3.14 /usr/local/lib/python3.14
+
 # Set the working directory in the container.
 WORKDIR /app
 

.generator/cli.py

@@ -1058,7 +1058,10 @@ def _process_version_file(content, version, version_path) -> str:
 
     Returns: A string with the modified content.
     """
-    pattern = r"(__version__\s*=\s*[\"'])([^\"']+)([\"'].*)"
+    if version_path.name.endswith("gapic_version.py"):
+        pattern = r"(__version__\s*=\s*[\"'])([^\"']+)([\"'].*)"
+    else:
+        pattern = r"(version\s*=\s*[\"'])([^\"']+)([\"'].*)"
     replacement_string = f"\\g<1>{version}\\g<3>"
     new_content, num_replacements = re.subn(pattern, replacement_string, content)
     if num_replacements == 0:
@@ -1071,8 +1074,9 @@ def _process_version_file(content, version, version_path) -> str:
 def _update_version_for_library(
     repo: str, output: str, path_to_library: str, version: str
 ):
-    """Updates the version string in `**/gapic_version.py` and `samples/**/snippet_metadata.json`
-        for a given library.
+    """Updates the version string in `**/gapic_version.py`, `setup.py`,
+        `pyproject.toml` and `samples/**/snippet_metadata.json` for a
+        given library, if applicable.
 
     Args:
         repo(str): This directory will contain all directories that make up a
@@ -1088,8 +1092,15 @@ def _update_version_for_library(
     """
 
     # Find and update gapic_version.py files
-    gapic_version_files = Path(f"{repo}/{path_to_library}").rglob("**/gapic_version.py")
-    for version_file in gapic_version_files:
+    version_files = list(Path(f"{repo}/{path_to_library}").rglob("**/gapic_version.py"))
+    if len(version_files) == 0:
+        # Fallback to `pyproject.toml`` or `setup.py``. Proto-only libraries have
+        # version information in `setup.py` or `pyproject.toml` instead of `gapic_version.py`.
+        pyproject_toml = Path(f"{repo}/{path_to_library}/pyproject.toml")
+        setup_py = Path(f"{repo}/{path_to_library}/setup.py")
+        version_files = [pyproject_toml if pyproject_toml.exists() else setup_py]
+
+    for version_file in version_files:
         updated_content = _process_version_file(
             _read_text_file(version_file), version, version_file
         )

.generator/requirements.in

@@ -1,7 +1,5 @@
 click
-# Temporarily use a patched version of the generator to avoid getting
-# new features/fixes for GAPIC libraries for the purposes of onboarding to librarian
-gapic-generator @ git+https://github.com/googleapis/[email protected]
+gapic-generator>=1.28.1 # Python 3.14 support, gapic-version support
 nox
 starlark-pyo3>=2025.1
 build

.generator/test_cli.py

@@ -965,7 +965,7 @@ def test_update_global_changelog(mocker, mock_release_init_request_file):
         handle.write.assert_called_once_with("[google-cloud-language==1.2.3]")
 
 
-def test_update_version_for_library_success(mocker):
+def test_update_version_for_library_success_gapic(mocker):
     m = mock_open()
 
     mock_rglob = mocker.patch(
@@ -984,7 +984,67 @@ def test_update_version_for_library_success(mocker):
 
         handle = m()
         assert handle.write.call_args_list[0].args[0] == '__version__ = "1.2.3"'
+        # Get all the arguments passed to the mock's write method
+        # and join them into a single string.
+        written_content = "".join(
+            [call.args[0] for call in handle.write.call_args_list[1:]]
+        )
+        # Create the expected output string with the correct formatting.
+        assert (
+            written_content
+            == '{\n  "clientLibrary": {\n    "version": "1.2.3"\n  }\n}\n'
+        )
+
+
+def test_update_version_for_library_success_proto_only_setup_py(mocker):
+    m = mock_open()
+
+    mock_rglob = mocker.patch("pathlib.Path.rglob")
+    mock_rglob.side_effect = [[], [pathlib.Path("repo/setup.py")]]
+    mock_shutil_copy = mocker.patch("shutil.copy")
+    mock_content = 'version = "1.2.2"'
+    mock_json_metadata = {"clientLibrary": {"version": "0.1.0"}}
+
+    with unittest.mock.patch("cli.open", m):
+        mocker.patch("cli._read_text_file", return_value=mock_content)
+        mocker.patch("cli._read_json_file", return_value=mock_json_metadata)
+        _update_version_for_library(
+            "repo", "output", "packages/google-cloud-language", "1.2.3"
+        )
+
+        handle = m()
+        assert handle.write.call_args_list[0].args[0] == 'version = "1.2.3"'
+        # Get all the arguments passed to the mock's write method
+        # and join them into a single string.
+        written_content = "".join(
+            [call.args[0] for call in handle.write.call_args_list[1:]]
+        )
+        # Create the expected output string with the correct formatting.
+        assert (
+            written_content
+            == '{\n  "clientLibrary": {\n    "version": "1.2.3"\n  }\n}\n'
+        )
+
+
+def test_update_version_for_library_success_proto_only_py_project_toml(mocker):
+    m = mock_open()
 
+    mock_path_exists = mocker.patch("pathlib.Path.exists")
+    mock_rglob = mocker.patch("pathlib.Path.rglob")
+    mock_rglob.side_effect = [[], [pathlib.Path("repo/pyproject.toml")]]
+    mock_shutil_copy = mocker.patch("shutil.copy")
+    mock_content = 'version = "1.2.2"'
+    mock_json_metadata = {"clientLibrary": {"version": "0.1.0"}}
+
+    with unittest.mock.patch("cli.open", m):
+        mocker.patch("cli._read_text_file", return_value=mock_content)
+        mocker.patch("cli._read_json_file", return_value=mock_json_metadata)
+        _update_version_for_library(
+            "repo", "output", "packages/google-cloud-language", "1.2.3"
+        )
+
+        handle = m()
+        assert handle.write.call_args_list[0].args[0] == 'version = "1.2.3"'
         # Get all the arguments passed to the mock's write method
         # and join them into a single string.
         written_content = "".join(
@@ -1099,18 +1159,18 @@ def test_update_changelog_for_library_failure(mocker):
 
 
 def test_process_version_file_success():
-    version_file_contents = '__version__ = "1.2.2"'
+    version_file_contents = 'version = "1.2.2"'
     new_version = "1.2.3"
     modified_content = _process_version_file(
-        version_file_contents, new_version, "file.txt"
+        version_file_contents, new_version, Path("file.txt")
     )
-    assert modified_content == f'__version__ = "{new_version}"'
+    assert modified_content == f'version = "{new_version}"'
 
 
 def test_process_version_file_failure():
     """Tests that value error is raised if the version string cannot be found"""
     with pytest.raises(ValueError):
-        _process_version_file("", "", "")
+        _process_version_file("", "", Path(""))
 
 
 def test_create_main_version_header():
@@ -1367,6 +1427,7 @@ def test_get_staging_child_directory_gapic_versioned():
     expected = "v1"
     assert _get_staging_child_directory(api_path, False) == expected
 
+
 def test_get_staging_child_directory_gapic_non_versioned():
     """
     Tests the behavior for GAPIC clients with no standard 'v' prefix versioning.

.github/.OwlBot.lock.yaml

@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python-mono-repo:latest
-  digest: sha256:b2dd6420495aa1a1057a73b80103ed2cabafa0c2c64a8bbf7221a7d6a067178f
+  digest: sha256:e5234b94d36c6c89c0a809ef7082a9be82ee66ffc3f4cbb9cb3641df563e4163

.github/workflows/configure_release_please.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Set up Python 3.11
         uses: actions/setup-python@v6
         with:
-          python-version: 3.13
+          python-version: 3.14
       - name: Run configure_release_please.py
         run: python3 configure_release_please.py
         working-directory: ./scripts/configure_release_please

.github/workflows/lint.yml

@@ -25,7 +25,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v6
       with:
-        python-version: "3.13"
+        python-version: "3.14"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel

.github/workflows/main.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Set up Python 3.10
         uses: actions/setup-python@v6
         with:
-          python-version: "3.13"
+          python-version: "3.14"
       - name: Install script dependencies
         run: pip3 install -r requirements.txt
         working-directory: ./scripts

.github/workflows/scripts.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v6
       with:
-        python-version: "3.13"
+        python-version: "3.14"
     - name: Install pytest
       run: |
         python -m pip install pytest

.github/workflows/unittest.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', "3.11", "3.12", "3.13"]
+        python: ['3.7', '3.8', '3.9', '3.10', "3.11", "3.12", "3.13", "3.14"]
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -86,8 +86,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ["3.13"]
-        option: ["core_deps_from_source"]
+        python: ["3.14"]
+        option: ["core_deps_from_source-3.14"]
     steps:
     - name: Checkout
       uses: actions/checkout@v4