Merge branch 'main' into owl-bot-copy

Author: daniel-sanche

.cross_sync/README.md

@@ -62,10 +62,12 @@ CrossSync provides a set of annotations to mark up async classes, to guide the g
 
 ### Code Generation
 
-Generation can be initiated using `python .cross_sync/generate.py .` 
+Generation can be initiated using `nox -s generate_sync`
 from the root of the project. This will find all classes with the `__CROSS_SYNC_OUTPUT__ = "path/to/output"` 
 annotation, and generate a sync version of classes marked with `@CrossSync.convert_sync` at the output path.
 
+There is a unit test at `tests/unit/data/test_sync_up_to_date.py` that verifies that the generated code is up to date
+
 ## Architecture
 
 CrossSync is made up of two parts:

.github/.OwlBot.lock.yaml

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
-  digest: sha256:5cddfe2fb5019bbf78335bc55f15bc13e18354a56b3ff46e1834f8e540807f05
-# created: 2024-10-31T01:41:07.349286254Z
+  digest: sha256:f016446d6e520e5fb552c45b110cba3f217bffdd3d06bdddd076e9e6d13266cf
+# created: 2025-02-21T19:32:52.01306189Z

.github/release-trigger.yml

@@ -1,2 +1,2 @@
 enabled: true
-multiScmName: 
+multiScmName: python-bigtable

.github/workflows/conformance.yaml

@@ -26,7 +26,15 @@ jobs:
       matrix:
         test-version: [ "v0.0.2" ]
         py-version: [ 3.8 ]
-        client-type: [ "async", "legacy" ]
+        client-type: [ "async", "sync", "legacy" ]
+        include:
+          - client-type: "sync"
+            # sync client does not support concurrent streams
+            test_args: "-skip _Generic_MultiStream"
+          - client-type: "legacy"
+            # legacy client is synchronous and does not support concurrent streams
+            # legacy client does not expose mutate_row. Disable those tests
+            test_args: "-skip _Generic_MultiStream -skip TestMutateRow_"
       fail-fast: false
     name: "${{ matrix.client-type }} client / python ${{ matrix.py-version }} / test tag ${{ matrix.test-version }}"
     steps:
@@ -53,4 +61,6 @@ jobs:
       env:
         CLIENT_TYPE: ${{ matrix.client-type }}
         PYTHONUNBUFFERED: 1
+        TEST_ARGS: ${{ matrix.test_args }}
+        PROXY_PORT: 9999
 

.github/workflows/docs.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Setup Python
       uses: actions/setup-python@v5
       with:
-        python-version: "3.9"
+        python-version: "3.10"
     - name: Install nox
       run: |
         python -m pip install --upgrade setuptools pip wheel

.github/workflows/unittest.yml

@@ -5,7 +5,10 @@ on:
 name: unittest
 jobs:
   unit:
-    runs-on: ubuntu-latest
+    # TODO(https://github.com/googleapis/gapic-generator-python/issues/2303): use `ubuntu-latest` once this bug is fixed.
+    # Use ubuntu-22.04 until Python 3.7 is removed from the test matrix
+    # https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']

.kokoro/build.sh

@@ -15,11 +15,13 @@
 
 set -eo pipefail
 
+CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
+
 if [[ -z "${PROJECT_ROOT:-}" ]]; then
-    PROJECT_ROOT="github/python-bigtable"
+  PROJECT_ROOT=$(realpath "${CURRENT_DIR}/..")
 fi
 
-cd "${PROJECT_ROOT}"
+pushd "${PROJECT_ROOT}"
 
 # Disable buffering, so that the logs stream through.
 export PYTHONUNBUFFERED=1
@@ -28,10 +30,16 @@ export PYTHONUNBUFFERED=1
 env | grep KOKORO
 
 # Setup service account credentials.
-export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+if [[ -f "${KOKORO_GFILE_DIR}/service-account.json" ]]
+then
+  export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/service-account.json
+fi
 
 # Setup project id.
-export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
+if [[ -f "${KOKORO_GFILE_DIR}/project-id.json" ]]
+then
+  export PROJECT_ID=$(cat "${KOKORO_GFILE_DIR}/project-id.json")
+fi
 
 # If this is a continuous build, send the test log to the FlakyBot.
 # See https://github.com/googleapis/repo-automation-bots/tree/main/packages/flakybot.
@@ -46,7 +54,7 @@ fi
 # If NOX_SESSION is set, it only runs the specified session,
 # otherwise run all the sessions.
 if [[ -n "${NOX_SESSION:-}" ]]; then
-    python3 -m nox -s ${NOX_SESSION:-}
+  python3 -m nox -s ${NOX_SESSION:-}
 else
-    python3 -m nox
+  python3 -m nox
 fi

.kokoro/conformance.sh

@@ -19,16 +19,7 @@ set -eo pipefail
 ## cd to the parent directory, i.e. the root of the git repo
 cd $(dirname $0)/..
 
-PROXY_ARGS=""
-TEST_ARGS=""
-if [[ "${CLIENT_TYPE^^}" == "LEGACY" ]]; then
-  echo "Using legacy client"
-  # legacy client does not expose mutate_row. Disable those tests
-  TEST_ARGS="-skip TestMutateRow_"
-fi
-
 # Build and start the proxy in a separate process
-PROXY_PORT=9999
 pushd test_proxy
 nohup python test_proxy.py --port $PROXY_PORT --client_type=$CLIENT_TYPE &
 proxyPID=$!
@@ -42,6 +33,7 @@ function cleanup() {
 trap cleanup EXIT
 
 # Run the conformance test
+echo "running tests with args: $TEST_ARGS"
 pushd cloud-bigtable-clients-test/tests
 eval "go test -v -proxy_addr=:$PROXY_PORT $TEST_ARGS"
 RETURN_CODE=$?

.kokoro/docker/docs/requirements.in

@@ -1 +1,2 @@
 nox
+gcp-docuploader