From 798d5adab44b49a82a3a9ab34c7d2acc00d949e6 Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 19:11:27 -0700 Subject: [PATCH 1/6] fix(infra): testing using latest python docker for samples --- .kokoro/common.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg index f58e4f76..c3a6b7e7 100644 --- a/.kokoro/common.cfg +++ b/.kokoro/common.cfg @@ -12,7 +12,7 @@ build_file: "getting-started-python/.kokoro/trampoline_v2.sh" # Use the Python worker docker iamge. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/python/getting-started-python" + value: "gcr.io/cloud-devrel-kokoro-resources/python-samples-testing-docker" } # Tell the trampoline which build file to use. From 938f4ad91479a1f1cd0ee45e5138f41b4ec14c81 Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 19:23:17 -0700 Subject: [PATCH 2/6] Fix(lint): Wrap long gcloud command comment to satisfy 79-character limit. --- optional-kubernetes-engine/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/optional-kubernetes-engine/config.py b/optional-kubernetes-engine/config.py index 7da9b4cc..83d9ccbd 100644 --- a/optional-kubernetes-engine/config.py +++ b/optional-kubernetes-engine/config.py @@ -83,7 +83,9 @@ # You also need to make sure that the default ACL is set to public-read, # otherwise users will not be able to see their upload images: # -# $ gcloud storage buckets update --predefined-default-object-acl=public-read gs:// +# $ gcloud storage buckets update \ +# --predefined-default-object-acl=public-read \ +# gs:// # # You can adjust the max content length and allow extensions settings to allow # larger or more varied file types if desired. From ee36f1997bb4aa982a4c956b35ad541f8b2aadaf Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 20:26:19 -0700 Subject: [PATCH 3/6] fix(infra): adding missing setuptools --- background/function/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/background/function/requirements.txt b/background/function/requirements.txt index b8e6aaad..926de46a 100644 --- a/background/function/requirements.txt +++ b/background/function/requirements.txt @@ -1,2 +1,3 @@ google-cloud-translate==3.11.1 google-cloud-firestore==2.11.1 +setuptools From 5029da97d1f74ae66a559ddf79937367785eee1a Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 20:26:56 -0700 Subject: [PATCH 4/6] fix(infra): fixing the errors around incompatible flask/werkzeug --- bookshelf/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/bookshelf/requirements.txt b/bookshelf/requirements.txt index 27d3d4fe..e2079664 100644 --- a/bookshelf/requirements.txt +++ b/bookshelf/requirements.txt @@ -5,3 +5,4 @@ google-cloud-error-reporting==1.9.1 google-cloud-logging==3.5.0 gunicorn==20.1.0 six==1.16.0 +Werkzeug<3.0.0 From e6a1d16e5f9096f675e0360444138138a6e5595a Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 20:27:34 -0700 Subject: [PATCH 5/6] fix(infra): fixing the errors around incompatible flask/werkzeug --- gce/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/gce/requirements.txt b/gce/requirements.txt index b655465f..e4e109fd 100644 --- a/gce/requirements.txt +++ b/gce/requirements.txt @@ -1,3 +1,4 @@ flask==2.2.5 honcho==1.1.0 gunicorn==20.1.0 +Werkzeug<3.0.0 From 95d5a96e3f38b38f1bd2411c84c5e57b12338ea6 Mon Sep 17 00:00:00 2001 From: Jennifer Davis Date: Mon, 16 Mar 2026 20:27:50 -0700 Subject: [PATCH 6/6] fix(infra): fixing the errors around incompatible flask/werkzeug --- sessions/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/sessions/requirements.txt b/sessions/requirements.txt index e0e267b5..b496a872 100644 --- a/sessions/requirements.txt +++ b/sessions/requirements.txt @@ -1,2 +1,3 @@ google-cloud-firestore==2.11.1 flask==2.2.5 +Werkzeug<3.0.0