From 44434aaa501c7097920140115074521c8ab87f63 Mon Sep 17 00:00:00 2001
From: Sanjeev Bhatt <sanjeevbhatt@google.com>
Date: Mon, 26 Aug 2024 10:49:41 +0530
Subject: [PATCH] chore(spanner): Issue#1143 - Update dependency (#1158)

* chore(spanner): Issue#1143 - Update dependency - Move grpc-interceptor to extras_required named testing

* chore(spanner): Issue#1143 - Update dependency - Move grpc-interceptor to extras_required named testing

* chore(spanner): Issue#1143 - Update dependency

- add dependency 'testing' for pretest

* chore(spanner): Issue#1143 - Update dependency

- add dependency 'testing' for docs and docfx sessions

* chore(spanner): Issue#1143 - Update dependency

  - Added "testing" dependency to owlbot.py
  - Fixed lint error

---------

Co-authored-by: Sri Harsha CH <57220027+harshachinta@users.noreply.github.com>
---
 noxfile.py | 9 +++++----
 owlbot.py  | 6 +++---
 setup.py   | 3 +--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 3b656a758c..e599d96369 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -59,6 +59,7 @@
 SYSTEM_TEST_DEPENDENCIES: List[str] = []
 SYSTEM_TEST_EXTRAS: List[str] = [
     "tracing",
+    "testing",
 ]
 SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
 
@@ -165,7 +166,7 @@ def install_unittest_dependencies(session, *constraints):
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
-    session.install("-e", ".[tracing]", "-c", constraints_path)
+    session.install("-e", ".[tracing, testing]", "-c", constraints_path)
     # XXX: Dump installed versions to debug OT issue
     session.run("pip", "list")
 
@@ -336,7 +337,7 @@ def cover(session):
 def docs(session):
     """Build the docs for this library."""
 
-    session.install("-e", ".[tracing]")
+    session.install("-e", ".[tracing, testing]")
     session.install(
         # We need to pin to specific versions of the `sphinxcontrib-*` packages
         # which still support sphinx 4.x.
@@ -371,7 +372,7 @@ def docs(session):
 def docfx(session):
     """Build the docfx yaml files for this library."""
 
-    session.install("-e", ".[tracing]")
+    session.install("-e", ".[tracing, testing]")
     session.install(
         # We need to pin to specific versions of the `sphinxcontrib-*` packages
         # which still support sphinx 4.x.
@@ -432,7 +433,7 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
         session.skip("cpp implementation is not supported in python 3.11+")
 
     # Install all dependencies
-    session.install("-e", ".[all, tests, tracing]")
+    session.install("-e", ".[all, tests, tracing, testing]")
     unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
     session.install(*unit_deps_all)
     system_deps_all = (
diff --git a/owlbot.py b/owlbot.py
index e9c12e593c..b7f09f2f74 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -128,7 +128,7 @@ def get_staging_dirs(
     samples=True,
     cov_level=98,
     split_system_tests=True,
-    system_test_extras=["tracing"],
+    system_test_extras=["tracing", "testing"],
 )
 s.move(
     templated_files,
@@ -180,7 +180,7 @@ def place_before(path, text, *before_text, escape=None):
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
-    session.install("-e", ".[tracing]", "-c", constraints_path)
+    session.install("-e", ".[tracing, testing]", "-c", constraints_path)
     # XXX: Dump installed versions to debug OT issue
     session.run("pip", "list")
 
@@ -229,7 +229,7 @@ def place_before(path, text, *before_text, escape=None):
 s.replace(
     "noxfile.py",
     r"""session.install\("-e", "."\)""",
-    """session.install("-e", ".[tracing]")""",
+    """session.install("-e", ".[tracing, testing]")""",
 )
 
 # Apply manual changes from PR https://github.com/googleapis/python-spanner/pull/759
diff --git a/setup.py b/setup.py
index 98b1a61748..5df9c6d82e 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,6 @@
 
 name = "google-cloud-spanner"
 
-
 description = "Google Cloud Spanner API client library"
 
 version = {}
@@ -43,7 +42,6 @@
     "sqlparse >= 0.4.4",
     "proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
     "protobuf>=3.20.2,<6.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
-    "grpc-interceptor >= 0.15.4",
 ]
 extras = {
     "tracing": [
@@ -52,6 +50,7 @@
         "opentelemetry-instrumentation >= 0.20b0, < 0.23dev",
     ],
     "libcst": "libcst >= 0.2.5",
+    "testing": "grpc-interceptor >= 0.15.4",
 }
 
 url = "https://github.com/googleapis/python-spanner"