Merge branch 'main' into add-showcase-test-rest-interceptors-metadata

Author: parthea

.flake8

@@ -1,12 +1,44 @@
 [flake8]
 ignore =
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E123, E124
   # Closing bracket mismatches opening bracket's line.
   # This works poorly with type annotations in method declarations.
   E123, E124
   # Line over-indented for visual indent.
   # This works poorly with type annotations in method declarations.
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E126, E128, E131
   E126, E128, E131
   # Line break after binary operator.
   # This catches line breaks after "and" / "or" as a means of breaking up
   # long if statements, which PEP 8 explicitly encourages.
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): W504
   W504
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E203
+  E203
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E501
+  E501
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E712
+  E712
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E711
+  E711
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E722
+  E722
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): E741
+  E741
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): F401
+  F401
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): F541
+  F541
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): F841
+  F841
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): F811
+  F811
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): W503
+  W503
+  # TODO(https://github.com/googleapis/gapic-generator-python/issues/2333): W291
+  W291
+exclude =
+  # Exclude golden files
+  tests/integration
+  # Exclude generated protobuf code
+  *_pb2.py

.githooks/pre-commit

@@ -93,19 +93,6 @@ if [ -x /usr/lib/git-core/google_hook ]; then
   /usr/lib/git-core/google_hook pre-commit "$@"
 fi
 
-# Check Python format.
-if [ $NUM_PYTHON_FILES_CHANGED -gt 0 ]
-then
-  echo_status "Running Python linter..."
-  find gapic tests -name "*.py" -not -path 'tests/integration/goldens/*' | xargs autopep8 --diff --exit-code
-  FORMAT_STATUS=$?
-  if [ $FORMAT_STATUS != 0 ]
-  then
-    echo_error "Linting failed." "Please try again after running autopep8 on the gapic/ and tests/ directories."
-    exit 1
-  fi
-fi
-
 # Check unit tests.
 if [ $NUM_PYTHON_FILES_CHANGED -gt 0 ] || [ $NUM_UNIT_GOLDEN_FILES_CHANGED -gt 0 ]
 then

.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:2ed982f884312e4883e01b5ab8af8b6935f0216a5a2d82928d273081fc3be562
-# created: 2024-11-12T12:09:45.821174897Z
+  digest: sha256:5581906b957284864632cde4e9c51d1cc66b0094990b27e689132fe5cd036046
+# created: 2025-03-05

.github/sync-repo-settings.yaml

@@ -65,7 +65,7 @@ branchProtectionRules:
     - 'goldens-lint'
     - 'goldens-prerelease'
     - 'goldens-unit'
-    - 'style-check'
+    - 'lint'
     - 'snippetgen'
     - 'unit (3.7)'
     - 'unit (3.8)'

.github/workflows/tests.yaml

@@ -60,7 +60,9 @@ jobs:
         target: [showcase, showcase_alternative_templates, showcase_w_rest_async]
         logging_scope: ["", "google"]
 
-    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
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python "${{ matrix.python }}"
@@ -149,7 +151,10 @@ jobs:
         # TODO(https://github.com/googleapis/gapic-generator-python/issues/2121) Remove `_w_rest_async` variant when async rest is GA.
         variant: ['', _alternative_templates, _mixins, _alternative_templates_mixins, _w_rest_async]
         logging_scope: ["", "google"]
-    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
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python "${{ matrix.python }}"
@@ -250,7 +255,10 @@ jobs:
     strategy:
       matrix:
         python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
-    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
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
@@ -272,7 +280,10 @@ jobs:
       matrix:
         python: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         variant: ['', _alternative_templates]
-    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
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python }}
@@ -379,7 +390,7 @@ jobs:
           nox -f tests/integration/goldens/eventarc/noxfile.py -s prerelease_deps
           nox -f tests/integration/goldens/logging/noxfile.py -s prerelease_deps
           nox -f tests/integration/goldens/redis/noxfile.py -s prerelease_deps
-  style-check:
+  lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -388,9 +399,9 @@ jobs:
         with:
           python-version: "3.13"
           cache: 'pip'
-      - name: Install autopep8
+      - name: Install nox.
         run: |
-            python -m pip install autopep8
-      - name: Check diff
+            python -m pip install nox
+      - name: Run lint
         run: |
-            find gapic tests -name "*.py" -not -path 'tests/**/goldens/*' | xargs autopep8 --diff --exit-code
+            nox -s lint

.kokoro/build.sh

@@ -15,11 +15,13 @@
 
 set -eo pipefail
 
+CURRENT_DIR=$(dirname "${BASH_SOURCE[0]}")
+
 if [[ -z "${PROJECT_ROOT:-}" ]]; then
-    PROJECT_ROOT="github/gapic-generator-python"
+  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