From c0db97a34fae0872a5472ec8b4cc85a49e2456d1 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Tue, 7 Oct 2025 23:33:53 +0000 Subject: [PATCH 1/2] chore(librarian): update gapic-generator --- .generator/Dockerfile | 10 +++++----- .generator/cli.py | 2 +- .generator/requirements.in | 4 +--- .generator/test_cli.py | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.generator/Dockerfile b/.generator/Dockerfile index 6c6f6f68b5ee..4947ec0b9276 100644 --- a/.generator/Dockerfile +++ b/.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 @@ -86,9 +86,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 @@ -115,6 +112,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 diff --git a/.generator/cli.py b/.generator/cli.py index c26934b788cc..e3930e540df9 100644 --- a/.generator/cli.py +++ b/.generator/cli.py @@ -802,7 +802,7 @@ def _run_nox_sessions(library_id: str, repo: str): the config.yaml. """ sessions = [ - "unit-3.13(protobuf_implementation='upb')", + "unit-3.14(protobuf_implementation='upb')", ] current_session = None try: diff --git a/.generator/requirements.in b/.generator/requirements.in index c39ccd4d6ff2..be8aad9cec77 100644 --- a/.generator/requirements.in +++ b/.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/gapic-generator-python@librarian-patch-v1.27.0 +gapic-generator>=1.28.0 # Python 3.14 support nox starlark-pyo3>=2025.1 build diff --git a/.generator/test_cli.py b/.generator/test_cli.py index ee5963a033fe..eca5cd20f699 100644 --- a/.generator/test_cli.py +++ b/.generator/test_cli.py @@ -702,7 +702,7 @@ def test_run_nox_sessions_success(mocker, mock_generate_request_data_for_nox): mock_run_individual_session = mocker.patch("cli._run_individual_session") sessions_to_run = [ - "unit-3.13(protobuf_implementation='upb')", + "unit-3.14(protobuf_implementation='upb')", ] _run_nox_sessions("mock-library", "repo") @@ -710,7 +710,7 @@ def test_run_nox_sessions_success(mocker, mock_generate_request_data_for_nox): mock_run_individual_session.assert_has_calls( [ mocker.call( - "unit-3.13(protobuf_implementation='upb')", "mock-library", "repo" + "unit-3.14(protobuf_implementation='upb')", "mock-library", "repo" ), ] ) From f1631747a3137c1af2464a82a015c216939c786e Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 8 Oct 2025 00:41:46 +0000 Subject: [PATCH 2/2] revert --- .generator/cli.py | 2 +- .generator/test_cli.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.generator/cli.py b/.generator/cli.py index e3930e540df9..c26934b788cc 100644 --- a/.generator/cli.py +++ b/.generator/cli.py @@ -802,7 +802,7 @@ def _run_nox_sessions(library_id: str, repo: str): the config.yaml. """ sessions = [ - "unit-3.14(protobuf_implementation='upb')", + "unit-3.13(protobuf_implementation='upb')", ] current_session = None try: diff --git a/.generator/test_cli.py b/.generator/test_cli.py index eca5cd20f699..ee5963a033fe 100644 --- a/.generator/test_cli.py +++ b/.generator/test_cli.py @@ -702,7 +702,7 @@ def test_run_nox_sessions_success(mocker, mock_generate_request_data_for_nox): mock_run_individual_session = mocker.patch("cli._run_individual_session") sessions_to_run = [ - "unit-3.14(protobuf_implementation='upb')", + "unit-3.13(protobuf_implementation='upb')", ] _run_nox_sessions("mock-library", "repo") @@ -710,7 +710,7 @@ def test_run_nox_sessions_success(mocker, mock_generate_request_data_for_nox): mock_run_individual_session.assert_has_calls( [ mocker.call( - "unit-3.14(protobuf_implementation='upb')", "mock-library", "repo" + "unit-3.13(protobuf_implementation='upb')", "mock-library", "repo" ), ] )