From e4fbe109f8f5f010529a16d479a81130f71d7387 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <57220027+harshachinta@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:30:47 +0530
Subject: [PATCH] Revert "chore(spanner): Issue#1143 - Update dependency
 (#1158)"

This reverts commit 44434aaa501c7097920140115074521c8ab87f63.
---
 noxfile.py | 7 +++----
 owlbot.py  | 6 +++---
 setup.py   | 3 ++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 8f0452d4d2..3b656a758c 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -59,7 +59,6 @@
 SYSTEM_TEST_DEPENDENCIES: List[str] = []
 SYSTEM_TEST_EXTRAS: List[str] = [
     "tracing",
-    "testing",
 ]
 SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
 
@@ -166,7 +165,7 @@ def install_unittest_dependencies(session, *constraints):
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
     )
-    session.install("-e", ".[tracing, testing]", "-c", constraints_path)
+    session.install("-e", ".[tracing]", "-c", constraints_path)
     # XXX: Dump installed versions to debug OT issue
     session.run("pip", "list")
 
@@ -337,7 +336,7 @@ def cover(session):
 def docs(session):
     """Build the docs for this library."""
 
-    session.install("-e", ".[tracing, testing]")
+    session.install("-e", ".[tracing]")
     session.install(
         # We need to pin to specific versions of the `sphinxcontrib-*` packages
         # which still support sphinx 4.x.
@@ -372,7 +371,7 @@ def docs(session):
 def docfx(session):
     """Build the docfx yaml files for this library."""
 
-    session.install("-e", ".[tracing, testing]")
+    session.install("-e", ".[tracing]")
     session.install(
         # We need to pin to specific versions of the `sphinxcontrib-*` packages
         # which still support sphinx 4.x.
diff --git a/owlbot.py b/owlbot.py
index b7f09f2f74..e9c12e593c 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", "testing"],
+    system_test_extras=["tracing"],
 )
 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, testing]", "-c", constraints_path)
+    session.install("-e", ".[tracing]", "-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, testing]")""",
+    """session.install("-e", ".[tracing]")""",
 )
 
 # Apply manual changes from PR https://github.com/googleapis/python-spanner/pull/759
diff --git a/setup.py b/setup.py
index 5df9c6d82e..98b1a61748 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@
 
 name = "google-cloud-spanner"
 
+
 description = "Google Cloud Spanner API client library"
 
 version = {}
@@ -42,6 +43,7 @@
     "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": [
@@ -50,7 +52,6 @@
         "opentelemetry-instrumentation >= 0.20b0, < 0.23dev",
     ],
     "libcst": "libcst >= 0.2.5",
-    "testing": "grpc-interceptor >= 0.15.4",
 }
 
 url = "https://github.com/googleapis/python-spanner"