Merge branch 'main' into scc-org-mgt-etd-api-create-get-upd-list-del

Author: vijaykanthm

.github/sync-repo-settings.yaml

@@ -44,8 +44,8 @@ branchProtectionRules:
   requiredStatusCheckContexts:
     - "Kokoro CI - Lint"
     - "Kokoro CI - Python 2.7 (App Engine Standard Only)"
-    - "Kokoro CI - Python 3.8"
-    - "Kokoro CI - Python 3.12"
+    - "Kokoro CI - Python 3.9"
+    - "Kokoro CI - Python 3.13"
     - "cla/google"
     - "snippet-bot check"
 # List of explicit permissions to add (additive only)

.kokoro/docker/cloudbuild.yaml

@@ -22,3 +22,6 @@ steps:
       args: ['tag', 'gcr.io/$PROJECT_ID/python-samples-testing-docker', 'gcr.io/$PROJECT_ID/python-samples-testing-docker:$SHORT_SHA']
 images:
      - 'gcr.io/$PROJECT_ID/python-samples-testing-docker'
+
+options:
+  logging: CLOUD_LOGGING_ONLY

.kokoro/tests/run_tests.sh

@@ -108,16 +108,18 @@ fi
 # On kokoro, we should be able to use the default service account. We
 # need to somehow bootstrap the secrets on other CI systems.
 if [[ "${TRAMPOLINE_CI}" == "kokoro" ]]; then
-    # This script will create 4 files:
+    # This script will create 5 files:
     # - testing/test-env.sh
     # - testing/service-account.json
     # - testing/client-secrets.json
     # - testing/cloudai-samples-secrets.sh
+    # - testing/cloudsql-samples-secrets.sh
     ./scripts/decrypt-secrets.sh
 fi
 
 source ./testing/test-env.sh
 source ./testing/cloudai-samples-secrets.sh
+source ./testing/cloudsql-samples-secrets.sh
 export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/testing/service-account.json
 
 # For cloud-run session, we activate the service account for gcloud sdk.
@@ -209,7 +211,7 @@ cd "$ROOT"
 
 # Remove secrets if we used decrypt-secrets.sh.
 if [[ -f "${KOKORO_GFILE_DIR}/secrets_viewer_service_account.json" ]]; then
-    rm testing/{test-env.sh,client-secrets.json,service-account.json,cloudai-samples-secrets.sh}
+    rm testing/{test-env.sh,client-secrets.json,service-account.json,cloudai-samples-secrets.sh,cloudsql-samples-secrets.sh}
 fi
 
 exit "$RTN"

AUTHORING_GUIDE.md

@@ -119,7 +119,7 @@ started with using a service or API — it should be in a _quickstart_ folder.
 
 ### Python Versions
 
-Samples should support Python 3.6, 3.7, 3.8, and 3.9.
+Samples should support Python 3.9, 3.10, 3.11, 3.12 and 3.13.
 
 If the API or service your sample works with has specific Python version
 requirements different from those mentioned above, the sample should support
@@ -923,7 +923,7 @@ Add the new environment variables to the `envs` dictionary.
 ```py
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    "ignored_versions": ["2.7", "3.7", "3.9", "3.10", "3.11"],
+    "ignored_versions": ["2.7", "3.8", "3.10", "3.11", "3.12"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": True,

README.md

@@ -2,7 +2,7 @@
 
 Python samples for [Google Cloud Platform products][cloud].
 
-[![Build Status][py-2.7-shield]][py-2.7-link] [![Build Status][py-3.8-shield]][py-3.8-link] [![Build Status][py-3.9-shield]][py-3.9-link] [![Build Status][py-3.10-shield]][py-3.10-link] [![Build Status][py-3.11-shield]][py-3.11-link]
+[![Build Status][py-2.7-shield]][py-2.7-link] [![Build Status][py-3.9-shield]][py-3.9-link] [![Build Status][py-3.10-shield]][py-3.10-link] [![Build Status][py-3.11-shield]][py-3.11-link] [![Build Status][py-3.12-shield]][py-3.12-link] [![Build Status][py-3.13-shield]][py-3.13-link]
 
 ## Google Cloud Samples
 
@@ -69,11 +69,13 @@ Contributions welcome! See the [Contributing Guide](CONTRIBUTING.md).
 
 [py-2.7-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-2.7.svg
 [py-2.7-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-2.7.html
-[py-3.8-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.8.svg
-[py-3.8-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.8.html
 [py-3.9-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.9.svg
 [py-3.9-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.9.html
 [py-3.10-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-310.svg
 [py-3.10-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.10.html
 [py-3.11-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-311.svg
 [py-3.11-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.11.html
+[py-3.12-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.12.svg
+[py-3.12-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.12.html
+[py-3.13-shield]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.13.svg
+[py-3.13-link]: https://storage.googleapis.com/cloud-devrel-public/python-docs-samples/badges/py-3.13.html

alloydb/notebooks/noxfile_config.py

@@ -14,7 +14,7 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    "ignored_versions": ["2.7", "3.7", "3.8", "3.9", "3.11", "3.12"],
+    "ignored_versions": ["2.7", "3.7", "3.8", "3.9", "3.11", "3.12", "3.13"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them
     "enforce_type_hints": True,

aml-ai/requirements.txt

@@ -1,4 +1,4 @@
 google-api-python-client==2.131.0
 google-auth-httplib2==0.2.0
-google-auth==2.19.1
-requests==2.31.0
+google-auth==2.38.0
+requests==2.32.2

appengine/flexible/README.md

@@ -8,7 +8,7 @@
 These are samples for using Python on Google App Engine Flexible Environment. These samples are typically referenced from the [docs](https://cloud.google.com/appengine/docs).
 
 For code samples of Python version 3.7 and earlier, please check
-https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/appengine/flexible.
+https://github.com/GoogleCloudPlatform/python-docs-samples/tree/main/appengine/flexible_python37_and_earlier
 
 See our other [Google Cloud Platform github repos](https://github.com/GoogleCloudPlatform) for sample applications and
 scaffolding for other frameworks and use cases.

appengine/flexible/analytics/noxfile_config.py

@@ -22,7 +22,6 @@
 
 TEST_CONFIG_OVERRIDE = {
     # You can opt out from the test for specific Python versions.
-    # Skipping for Python 3.9 due to pyarrow compilation failure.
     "ignored_versions": ["2.7", "3.7"],
     # Old samples are opted out of enforcing Python type hints
     # All new samples should feature them

appengine/flexible/analytics/requirements.txt

@@ -1,6 +1,6 @@
 Flask==3.0.3; python_version > '3.6'
 Flask==2.3.3; python_version < '3.7'
 Werkzeug==3.0.3; python_version > '3.6'
-Werkzeug==2.3.7; python_version < '3.7'
-gunicorn==22.0.0
+Werkzeug==2.3.8; python_version < '3.7'
+gunicorn==23.0.0
 requests[security]==2.31.0