chore: update templated files (#1156)

* chore: update templated files

* update replacements in owlbot.py

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* clean up replacement

* update replacement in owlbot.py

* update replacement in owlbot.py

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

.flake8

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.github/.OwlBot.lock.yaml

@@ -13,5 +13,4 @@
 # limitations under the License.
 docker:
  image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
- digest: sha256:5a4c19d17e597b92d786e569be101e636c9c2817731f80a5adec56b2aa8fe070
-# created: 2024-04-12T11:35:58.922854369Z
+ digest: sha256:5651442a6336971a2fb2df40fb56b3337df67cafa14c0809cc89cb34ccee1b8e

.github/auto-label.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/docker/docs/Dockerfile

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/populate-secrets.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC.
+# Copyright 2024 Google LLC.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/publish-docs.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/test-samples-against-head.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/test-samples.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/trampoline.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.kokoro/trampoline_v2.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

.trampolinerc

@@ -1,4 +1,4 @@
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

MANIFEST.in

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

docs/conf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

noxfile.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -160,22 +160,22 @@ def install_unittest_dependencies(session, *constraints):
  else:
  session.install("-e", ".", *constraints)
 
-
-def default(session):
- # Install all test dependencies, then install this package in-place.
-
+ # XXX Work around Kokoro image's older pip, which borks the OT install.
+ session.run("pip", "install", "--upgrade", "pip")
  constraints_path = str(
  CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
  )
- install_unittest_dependencies(session, "-c", constraints_path)
+ session.install("-e", ".[tracing]", "-c", constraints_path)
+ # XXX: Dump installed versions to debug OT issue
+ session.run("pip", "list")
 
- # Run py.test against the unit tests.
+ # Run py.test against the unit tests with OpenTelemetry.
  session.run(
  "py.test",
  "--quiet",
- f"--junitxml=unit_{session.python}_sponge_log.xml",
- "--cov=google",
- "--cov=tests/unit",
+ "--cov=google.cloud.spanner",
+ "--cov=google.cloud",
+ "--cov=tests.unit",
  "--cov-append",
  "--cov-config=.coveragerc",
  "--cov-report=",
@@ -184,34 +184,48 @@ def default(session):
  *session.posargs,
  )
 
- # XXX Work around Kokoro image's older pip, which borks the OT install.
- session.run("pip", "install", "--upgrade", "pip")
- session.install("-e", ".[tracing]", "-c", constraints_path)
- # XXX: Dump installed versions to debug OT issue
- session.run("pip", "list")
 
- # Run py.test against the unit tests with OpenTelemetry.
+@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
+@nox.parametrize(
+ "protobuf_implementation",
+ ["python", "upb", "cpp"],
+)
+def unit(session, protobuf_implementation):
+ # Install all test dependencies, then install this package in-place.
+
+ if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
+ session.skip("cpp implementation is not supported in python 3.11+")
+
+ constraints_path = str(
+ CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
+ )
+ install_unittest_dependencies(session, "-c", constraints_path)
+
+ # TODO(https://github.com/googleapis/synthtool/issues/1976):
+ # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
+ # The 'cpp' implementation requires Protobuf<4.
+ if protobuf_implementation == "cpp":
+ session.install("protobuf<4")
+
+ # Run py.test against the unit tests.
  session.run(
  "py.test",
  "--quiet",
- "--cov=google.cloud.spanner",
- "--cov=google.cloud",
- "--cov=tests.unit",
+ f"--junitxml=unit_{session.python}_sponge_log.xml",
+ "--cov=google",
+ "--cov=tests/unit",
  "--cov-append",
  "--cov-config=.coveragerc",
  "--cov-report=",
  "--cov-fail-under=0",
  os.path.join("tests", "unit"),
  *session.posargs,
+ env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+ },
  )
 
 
-@nox.session(python=UNIT_TEST_PYTHON_VERSIONS)
-def unit(session):
- """Run the unit test suite."""
- default(session)
-
-
 def install_systemtest_dependencies(session, *constraints):
  # Use pre-release gRPC for system tests.
  # Exclude version 1.52.0rc1 which has a known issue.
@@ -399,11 +413,24 @@ def docfx(session):
  )
 
 
-@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
-@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
-def prerelease_deps(session, database_dialect):
+@nox.session(python="3.12")
+@nox.parametrize(
+ "protobuf_implementation,database_dialect",
+ [
+ ("python", "GOOGLE_STANDARD_SQL"),
+ ("python", "POSTGRESQL"),
+ ("upb", "GOOGLE_STANDARD_SQL"),
+ ("upb", "POSTGRESQL"),
+ ("cpp", "GOOGLE_STANDARD_SQL"),
+ ("cpp", "POSTGRESQL"),
+ ],
+)
+def prerelease_deps(session, protobuf_implementation, database_dialect):
  """Run all tests with prerelease versions of dependencies installed."""
 
+ if protobuf_implementation == "cpp" and session.python in ("3.11", "3.12"):
+ session.skip("cpp implementation is not supported in python 3.11+")
+
  # Install all dependencies
  session.install("-e", ".[all, tests, tracing]")
  unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
@@ -438,9 +465,9 @@ def prerelease_deps(session, database_dialect):
  "protobuf",
  # dependency of grpc
  "six",
+ "grpc-google-iam-v1",
  "googleapis-common-protos",
- # Exclude version 1.52.0rc1 which has a known issue. See https://github.com/grpc/grpc/issues/32163
- "grpcio!=1.52.0rc1",
+ "grpcio",
  "grpcio-status",
  "google-api-core",
  "google-auth",
@@ -466,7 +493,15 @@ def prerelease_deps(session, database_dialect):
  session.run("python", "-c", "import grpc; print(grpc.__version__)")
  session.run("python", "-c", "import google.auth; print(google.auth.__version__)")
 
- session.run("py.test", "tests/unit")
+ session.run(
+ "py.test",
+ "tests/unit",
+ env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+ "SPANNER_DATABASE_DIALECT": database_dialect,
+ "SKIP_BACKUP_TESTS": "true",
+ },
+ )
 
  system_test_path = os.path.join("tests", "system.py")
  system_test_folder_path = os.path.join("tests", "system")
@@ -480,6 +515,7 @@ def prerelease_deps(session, database_dialect):
  system_test_path,
  *session.posargs,
  env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
  "SPANNER_DATABASE_DIALECT": database_dialect,
  "SKIP_BACKUP_TESTS": "true",
  },
@@ -492,6 +528,7 @@ def prerelease_deps(session, database_dialect):
  system_test_folder_path,
  *session.posargs,
  env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
  "SPANNER_DATABASE_DIALECT": database_dialect,
  "SKIP_BACKUP_TESTS": "true",
  },

owlbot.py

@@ -177,6 +177,9 @@ def place_before(path, text, *before_text, escape=None):
 open_telemetry_test = """
  # XXX Work around Kokoro image's older pip, which borks the OT install.
  session.run("pip", "install", "--upgrade", "pip")
+ constraints_path = str(
+ CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
+ )
  session.install("-e", ".[tracing]", "-c", constraints_path)
  # XXX: Dump installed versions to debug OT issue
  session.run("pip", "list")
@@ -239,33 +242,69 @@ def system\(session\):""",
 def system(session, database_dialect):""",
 )
 
-s.replace("noxfile.py",
- """system_test_path,
-  \*session.posargs,""",
- """system_test_path,
-  *session.posargs,
+s.replace(
+ "noxfile.py",
+ """\*session.posargs,
+  \)""",
+ """*session.posargs,
  env={
  "SPANNER_DATABASE_DIALECT": database_dialect,
  "SKIP_BACKUP_TESTS": "true",
- },"""
+ },
+ )""",
 )
 
 s.replace("noxfile.py",
- """system_test_folder_path,
- \*session.posargs,""",
- """system_test_folder_path,
-  *session.posargs,
- env={
+ """env={
+  "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+  },""",
+ """env={
+  "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
  "SPANNER_DATABASE_DIALECT": database_dialect,
  "SKIP_BACKUP_TESTS": "true",
- },"""
+ },""",
+)
+
+s.replace("noxfile.py",
+"""session.run\(
+ "py.test",
+ "tests/unit",
+ env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+ },
+ \)""",
+"""session.run(
+ "py.test",
+ "tests/unit",
+ env={
+ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+ "SPANNER_DATABASE_DIALECT": database_dialect,
+ "SKIP_BACKUP_TESTS": "true",
+ },
+ )""",
 )
 
 s.replace(
  "noxfile.py",
- """def prerelease_deps\(session\):""",
- """@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
-def prerelease_deps(session, database_dialect):"""
+ """\@nox.session\(python="3.12"\)
+\@nox.parametrize\(
+ "protobuf_implementation",
+ \[ "python", "upb", "cpp" \],
+\)
+def prerelease_deps\(session, protobuf_implementation\):""",
+ """@nox.session(python="3.12")
+@nox.parametrize(
+ "protobuf_implementation,database_dialect",
+ [
+ ("python", "GOOGLE_STANDARD_SQL"),
+ ("python", "POSTGRESQL"),
+ ("upb", "GOOGLE_STANDARD_SQL"),
+ ("upb", "POSTGRESQL"),
+ ("cpp", "GOOGLE_STANDARD_SQL"),
+ ("cpp", "POSTGRESQL"),
+ ],
+)
+def prerelease_deps(session, protobuf_implementation, database_dialect):""",
 )
 
 s.shell.run(["nox", "-s", "blacken"], hide_output=False)

scripts/decrypt-secrets.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2023 Google LLC All rights reserved.
+# Copyright 2024 Google LLC All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

scripts/readme-gen/readme_gen.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright 2023 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.