Skip to content

Commit 44434aa

Browse files
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 <[email protected]>
1 parent 3c91a01 commit 44434aa

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

noxfile.py

+5-4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
SYSTEM_TEST_DEPENDENCIES: List[str] = []
6060
SYSTEM_TEST_EXTRAS: List[str] = [
6161
"tracing",
62+
"testing",
6263
]
6364
SYSTEM_TEST_EXTRAS_BY_PYTHON: Dict[str, List[str]] = {}
6465

@@ -165,7 +166,7 @@ def install_unittest_dependencies(session, *constraints):
165166
constraints_path = str(
166167
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
167168
)
168-
session.install("-e", ".[tracing]", "-c", constraints_path)
169+
session.install("-e", ".[tracing, testing]", "-c", constraints_path)
169170
# XXX: Dump installed versions to debug OT issue
170171
session.run("pip", "list")
171172

@@ -336,7 +337,7 @@ def cover(session):
336337
def docs(session):
337338
"""Build the docs for this library."""
338339

339-
session.install("-e", ".[tracing]")
340+
session.install("-e", ".[tracing, testing]")
340341
session.install(
341342
# We need to pin to specific versions of the `sphinxcontrib-*` packages
342343
# which still support sphinx 4.x.
@@ -371,7 +372,7 @@ def docs(session):
371372
def docfx(session):
372373
"""Build the docfx yaml files for this library."""
373374

374-
session.install("-e", ".[tracing]")
375+
session.install("-e", ".[tracing, testing]")
375376
session.install(
376377
# We need to pin to specific versions of the `sphinxcontrib-*` packages
377378
# which still support sphinx 4.x.
@@ -432,7 +433,7 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
432433
session.skip("cpp implementation is not supported in python 3.11+")
433434

434435
# Install all dependencies
435-
session.install("-e", ".[all, tests, tracing]")
436+
session.install("-e", ".[all, tests, tracing, testing]")
436437
unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES
437438
session.install(*unit_deps_all)
438439
system_deps_all = (

owlbot.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def get_staging_dirs(
128128
samples=True,
129129
cov_level=98,
130130
split_system_tests=True,
131-
system_test_extras=["tracing"],
131+
system_test_extras=["tracing", "testing"],
132132
)
133133
s.move(
134134
templated_files,
@@ -180,7 +180,7 @@ def place_before(path, text, *before_text, escape=None):
180180
constraints_path = str(
181181
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
182182
)
183-
session.install("-e", ".[tracing]", "-c", constraints_path)
183+
session.install("-e", ".[tracing, testing]", "-c", constraints_path)
184184
# XXX: Dump installed versions to debug OT issue
185185
session.run("pip", "list")
186186
@@ -229,7 +229,7 @@ def place_before(path, text, *before_text, escape=None):
229229
s.replace(
230230
"noxfile.py",
231231
r"""session.install\("-e", "."\)""",
232-
"""session.install("-e", ".[tracing]")""",
232+
"""session.install("-e", ".[tracing, testing]")""",
233233
)
234234

235235
# Apply manual changes from PR https://github.com/googleapis/python-spanner/pull/759

setup.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
name = "google-cloud-spanner"
2424

25-
2625
description = "Google Cloud Spanner API client library"
2726

2827
version = {}
@@ -43,7 +42,6 @@
4342
"sqlparse >= 0.4.4",
4443
"proto-plus >= 1.22.2, <2.0.0dev; python_version>='3.11'",
4544
"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",
46-
"grpc-interceptor >= 0.15.4",
4745
]
4846
extras = {
4947
"tracing": [
@@ -52,6 +50,7 @@
5250
"opentelemetry-instrumentation >= 0.20b0, < 0.23dev",
5351
],
5452
"libcst": "libcst >= 0.2.5",
53+
"testing": "grpc-interceptor >= 0.15.4",
5554
}
5655

5756
url = "https://github.com/googleapis/python-spanner"

0 commit comments

Comments
 (0)