From 4ffa231d30e4eead151f8a79d4bf3c02609f7755 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Thu, 25 Jun 2026 18:25:20 -0400
Subject: [PATCH 01/12] fix(ci): run coverage report from package directory to
 fix path matching

---
 .github/workflows/unittest.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index ded62f7ddf67..626c55971c4b 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -117,21 +117,23 @@ jobs:
               echo "============================================================"
 
               set +e
-              if [ -f "${pkg}/.coveragerc" ]; then
+              pushd "${pkg}" > /dev/null
+              if [ -f ".coveragerc" ]; then
                 echo "Using package-specific configuration: ${pkg}/.coveragerc"
                 # If fail_under is specified in the package-specific .coveragerc, coverage report
                 # will automatically enforce it. Otherwise, we enforce the default.
-                if grep -q "fail_under" "${pkg}/.coveragerc"; then
-                  coverage report --rcfile="${pkg}/.coveragerc" --include="${pkg}/**"
+                if grep -q "fail_under" ".coveragerc"; then
+                  COVERAGE_FILE=../../.coverage coverage report
                 else
                   echo "No fail_under specified in ${pkg}/.coveragerc, enforcing default"
-                  coverage report --rcfile="${pkg}/.coveragerc" --include="${pkg}/**" --fail-under="${DEFAULT_FAIL_UNDER}"
+                  COVERAGE_FILE=../../.coverage coverage report --fail-under="${DEFAULT_FAIL_UNDER}"
                 fi
               else
                 echo "No .coveragerc found for ${pkg}, enforcing default"
-                coverage report --include="${pkg}/**" --fail-under="${DEFAULT_FAIL_UNDER}"
+                COVERAGE_FILE=../../.coverage coverage report --fail-under="${DEFAULT_FAIL_UNDER}"
               fi
               status=$?
+              popd > /dev/null
               set -e
 
               if [ ${status} -ne 0 ]; then

From bd63800bf5549f14021859e860210d34792ab1a6 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 05:27:01 -0400
Subject: [PATCH 02/12] chore: add dummy comments to trigger CI/CD for coverage
 testing

---
 packages/google-cloud-core/google/cloud/version.py              | 2 ++
 .../google-cloud-logging/google/cloud/logging/gapic_version.py  | 2 ++
 .../google/cloud/spanner_driver/version.py                      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/packages/google-cloud-core/google/cloud/version.py b/packages/google-cloud-core/google/cloud/version.py
index ae34a9fbeb85..a127d921086c 100644
--- a/packages/google-cloud-core/google/cloud/version.py
+++ b/packages/google-cloud-core/google/cloud/version.py
@@ -13,3 +13,5 @@
 # limitations under the License.
 
 __version__ = "2.6.0"
+# Dummy comment to trigger CI/CD
+
diff --git a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
index b33afb1709fe..d6fa32e91485 100644
--- a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
+++ b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
@@ -14,3 +14,5 @@
 # limitations under the License.
 #
 __version__ = "3.16.0"  # {x-release-please-version}
+# Dummy comment to trigger CI/CD
+
diff --git a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
index e2d420ede8f5..1276a77bcc4f 100644
--- a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
+++ b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
@@ -14,3 +14,5 @@
 # limitations under the License.
 #
 __version__ = "0.0.1"  # {x-release-please-version}
+# Dummy comment to trigger CI/CD
+

From 6388ca07d8b4b83531e8050f8a00ffb9ff27187f Mon Sep 17 00:00:00 2001
From: Chalmer Lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 05:31:07 -0400
Subject: [PATCH 03/12] remove blank line

---
 packages/google-cloud-core/google/cloud/version.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/google-cloud-core/google/cloud/version.py b/packages/google-cloud-core/google/cloud/version.py
index a127d921086c..a0cc96949714 100644
--- a/packages/google-cloud-core/google/cloud/version.py
+++ b/packages/google-cloud-core/google/cloud/version.py
@@ -14,4 +14,3 @@
 
 __version__ = "2.6.0"
 # Dummy comment to trigger CI/CD
-

From e1ace176122f71aaf2b28713d60a38aff88bd346 Mon Sep 17 00:00:00 2001
From: Chalmer Lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 05:31:17 -0400
Subject: [PATCH 04/12] remove blank line

---
 .../google/cloud/spanner_driver/version.py                       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
index 1276a77bcc4f..901132b9c376 100644
--- a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
+++ b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
@@ -15,4 +15,3 @@
 #
 __version__ = "0.0.1"  # {x-release-please-version}
 # Dummy comment to trigger CI/CD
-

From 86d10efe66103ccbc499f2fd716e03ae0af43594 Mon Sep 17 00:00:00 2001
From: Chalmer Lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 05:31:25 -0400
Subject: [PATCH 05/12] remove blank line

---
 .../google-cloud-logging/google/cloud/logging/gapic_version.py   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
index d6fa32e91485..08184bf3c749 100644
--- a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
+++ b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
@@ -15,4 +15,3 @@
 #
 __version__ = "3.16.0"  # {x-release-please-version}
 # Dummy comment to trigger CI/CD
-

From b3165b6d37075833e1438891a3dd7fe13192baf1 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 06:15:37 -0400
Subject: [PATCH 06/12] fix(ci): isolate package coverage report to prevent
 pollution and fix omit path matching

---
 .github/workflows/unittest.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
index 626c55971c4b..f54c3fa446d2 100644
--- a/.github/workflows/unittest.yml
+++ b/.github/workflows/unittest.yml
@@ -123,14 +123,14 @@ jobs:
                 # If fail_under is specified in the package-specific .coveragerc, coverage report
                 # will automatically enforce it. Otherwise, we enforce the default.
                 if grep -q "fail_under" ".coveragerc"; then
-                  COVERAGE_FILE=../../.coverage coverage report
+                  COVERAGE_FILE=../../.coverage coverage report --include="$PWD/**"
                 else
                   echo "No fail_under specified in ${pkg}/.coveragerc, enforcing default"
-                  COVERAGE_FILE=../../.coverage coverage report --fail-under="${DEFAULT_FAIL_UNDER}"
+                  COVERAGE_FILE=../../.coverage coverage report --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}"
                 fi
               else
                 echo "No .coveragerc found for ${pkg}, enforcing default"
-                COVERAGE_FILE=../../.coverage coverage report --fail-under="${DEFAULT_FAIL_UNDER}"
+                COVERAGE_FILE=../../.coverage coverage report --include="$PWD/**" --fail-under="${DEFAULT_FAIL_UNDER}"
               fi
               status=$?
               popd > /dev/null

From 9eed8e27dbf7d1025d1ecac7ffbb8137aff2f47c Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 06:26:05 -0400
Subject: [PATCH 07/12] chore(spanner): set fail_under to 89 to prevent
 coverage regressions

---
 packages/google-cloud-spanner-dbapi-driver/.coveragerc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/google-cloud-spanner-dbapi-driver/.coveragerc b/packages/google-cloud-spanner-dbapi-driver/.coveragerc
index b36fd06d4caf..f1e4de0e6896 100644
--- a/packages/google-cloud-spanner-dbapi-driver/.coveragerc
+++ b/packages/google-cloud-spanner-dbapi-driver/.coveragerc
@@ -3,6 +3,10 @@ branch = True
 
 [report]
 show_missing = True
+# The spanner library has not had 100% coverage in the past and until such a time
+# as the unittest coverage is fixed, we need to set it at an appropriate level
+# to detect regressions in coverage but not fail due to known lack of coverage.
+fail_under = 89
 omit =
     google/cloud/spanner_driver/__init__.py
 exclude_lines =

From b32d23b32e9b4537389da4cd23281d004aad56c1 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 06:36:40 -0400
Subject: [PATCH 08/12] chore: remove dummy comments used for CI/CD testing

---
 packages/google-cloud-core/google/cloud/version.py               | 1 -
 .../google-cloud-logging/google/cloud/logging/gapic_version.py   | 1 -
 .../google/cloud/spanner_driver/version.py                       | 1 -
 3 files changed, 3 deletions(-)

diff --git a/packages/google-cloud-core/google/cloud/version.py b/packages/google-cloud-core/google/cloud/version.py
index a0cc96949714..ae34a9fbeb85 100644
--- a/packages/google-cloud-core/google/cloud/version.py
+++ b/packages/google-cloud-core/google/cloud/version.py
@@ -13,4 +13,3 @@
 # limitations under the License.
 
 __version__ = "2.6.0"
-# Dummy comment to trigger CI/CD
diff --git a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
index 08184bf3c749..b33afb1709fe 100644
--- a/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
+++ b/packages/google-cloud-logging/google/cloud/logging/gapic_version.py
@@ -14,4 +14,3 @@
 # limitations under the License.
 #
 __version__ = "3.16.0"  # {x-release-please-version}
-# Dummy comment to trigger CI/CD
diff --git a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
index 901132b9c376..e2d420ede8f5 100644
--- a/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
+++ b/packages/google-cloud-spanner-dbapi-driver/google/cloud/spanner_driver/version.py
@@ -14,4 +14,3 @@
 # limitations under the License.
 #
 __version__ = "0.0.1"  # {x-release-please-version}
-# Dummy comment to trigger CI/CD

From 24226e9f614fdcf0bf062f4c15e9bd64e94e4e19 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 06:49:33 -0400
Subject: [PATCH 09/12] chore(spanner): skip system tests if required env vars
 are missing

---
 .../tests/system/_helper.py                          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
index e940f79c01ee..898c227690cc 100644
--- a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
+++ b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
@@ -14,19 +14,21 @@
 """Helper functions for system tests."""
 
 import os
+import pytest
 
 SPANNER_EMULATOR_HOST = os.environ.get("SPANNER_EMULATOR_HOST")
 TEST_ON_PROD = not bool(SPANNER_EMULATOR_HOST)
 
 if TEST_ON_PROD:
-    PROJECT_ID = os.environ.get("SPANNER_PROJECT_ID")
-    INSTANCE_ID = os.environ.get("SPANNER_INSTANCE_ID")
+    PROJECT_ID = os.environ.get("SPANNER_PROJECT_ID") or os.environ.get("GOOGLE_CLOUD_PROJECT") or os.environ.get("PROJECT_ID")
+    INSTANCE_ID = os.environ.get("SPANNER_INSTANCE_ID") or os.environ.get("GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE")
     DATABASE_ID = os.environ.get("SPANNER_DATABASE_ID")
 
     if not PROJECT_ID or not INSTANCE_ID or not DATABASE_ID:
-        raise ValueError(
-            "SPANNER_PROJECT_ID, SPANNER_INSTANCE_ID, and SPANNER_DATABASE_ID "
-            "must be set when running tests on production."
+        pytest.skip(
+            "SPANNER_PROJECT_ID, SPANNER_INSTANCE_ID, and SPANNER_DATABASE_ID (or standard fallbacks) "
+            "must be set when running tests on production.",
+            allow_module_level=True
         )
 else:
     PROJECT_ID = "test-project"

From fd399d30445cad59211193297a4340d55423b07a Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 08:06:12 -0400
Subject: [PATCH 10/12] chore(spanner): add explanatory comment for system test
 skip logic

---
 .../tests/system/_helper.py                                | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
index 898c227690cc..dc048e4a0f7a 100644
--- a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
+++ b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
@@ -16,9 +16,10 @@
 import os
 import pytest
 
-SPANNER_EMULATOR_HOST = os.environ.get("SPANNER_EMULATOR_HOST")
-TEST_ON_PROD = not bool(SPANNER_EMULATOR_HOST)
-
+# As of June 2026, this package is in 'Planning' status.
+# The CI/CD system does not yet have a SPANNER_EMULATOR_HOST active for this package,
+# so running tests on production is the default. This fallback and skip logic acts
+# as a safety measure until an emulator is available or production credentials are fully configured.
 if TEST_ON_PROD:
     PROJECT_ID = os.environ.get("SPANNER_PROJECT_ID") or os.environ.get("GOOGLE_CLOUD_PROJECT") or os.environ.get("PROJECT_ID")
     INSTANCE_ID = os.environ.get("SPANNER_INSTANCE_ID") or os.environ.get("GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE")

From b24c649604730789a379048c2be255eb6028370d Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 08:20:17 -0400
Subject: [PATCH 11/12] fix(spanner): restore missing TEST_ON_PROD and
 SPANNER_EMULATOR_HOST definitions

---
 .../google-cloud-spanner-dbapi-driver/tests/system/_helper.py  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
index dc048e4a0f7a..bfed801a721a 100644
--- a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
+++ b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
@@ -16,6 +16,9 @@
 import os
 import pytest
 
+SPANNER_EMULATOR_HOST = os.environ.get("SPANNER_EMULATOR_HOST")
+TEST_ON_PROD = not bool(SPANNER_EMULATOR_HOST)
+
 # As of June 2026, this package is in 'Planning' status.
 # The CI/CD system does not yet have a SPANNER_EMULATOR_HOST active for this package,
 # so running tests on production is the default. This fallback and skip logic acts

From 11aa84e54f4a8c903c868ab0a4ed0d4362672016 Mon Sep 17 00:00:00 2001
From: chalmer lowe <chalmerlowe@google.com>
Date: Fri, 26 Jun 2026 08:22:03 -0400
Subject: [PATCH 12/12] chore(spanner): format _helper.py to satisfy ruff

---
 .../tests/system/_helper.py                          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
index bfed801a721a..42ad891e92ba 100644
--- a/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
+++ b/packages/google-cloud-spanner-dbapi-driver/tests/system/_helper.py
@@ -24,15 +24,21 @@
 # so running tests on production is the default. This fallback and skip logic acts
 # as a safety measure until an emulator is available or production credentials are fully configured.
 if TEST_ON_PROD:
-    PROJECT_ID = os.environ.get("SPANNER_PROJECT_ID") or os.environ.get("GOOGLE_CLOUD_PROJECT") or os.environ.get("PROJECT_ID")
-    INSTANCE_ID = os.environ.get("SPANNER_INSTANCE_ID") or os.environ.get("GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE")
+    PROJECT_ID = (
+        os.environ.get("SPANNER_PROJECT_ID")
+        or os.environ.get("GOOGLE_CLOUD_PROJECT")
+        or os.environ.get("PROJECT_ID")
+    )
+    INSTANCE_ID = os.environ.get("SPANNER_INSTANCE_ID") or os.environ.get(
+        "GOOGLE_CLOUD_TESTS_SPANNER_INSTANCE"
+    )
     DATABASE_ID = os.environ.get("SPANNER_DATABASE_ID")
 
     if not PROJECT_ID or not INSTANCE_ID or not DATABASE_ID:
         pytest.skip(
             "SPANNER_PROJECT_ID, SPANNER_INSTANCE_ID, and SPANNER_DATABASE_ID (or standard fallbacks) "
             "must be set when running tests on production.",
-            allow_module_level=True
+            allow_module_level=True,
         )
 else:
     PROJECT_ID = "test-project"