Skip to content

Commit 7f671bb

Browse files
1 parent 4a3a459 commit 7f671bb

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

‎noxfile.py‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -294,18 +294,8 @@ def install_systemtest_dependencies(session, *constraints):
294294

295295

296296
@nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
297-
@nox.parametrize(
298-
"protobuf_implementation,database_dialect",
299-
[
300-
("python", "GOOGLE_STANDARD_SQL"),
301-
("python", "POSTGRESQL"),
302-
("upb", "GOOGLE_STANDARD_SQL"),
303-
("upb", "POSTGRESQL"),
304-
("cpp", "GOOGLE_STANDARD_SQL"),
305-
("cpp", "POSTGRESQL"),
306-
],
307-
)
308-
def system(session, protobuf_implementation, database_dialect):
297+
@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
298+
def system(session, database_dialect):
309299
"""Run the system test suite."""
310300
constraints_path = str(
311301
CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
@@ -339,12 +329,6 @@ def system(session, protobuf_implementation, database_dialect):
339329

340330
install_systemtest_dependencies(session, "-c", constraints_path)
341331

342-
# TODO(https://github.com/googleapis/synthtool/issues/1976):
343-
# Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
344-
# The 'cpp' implementation requires Protobuf<4.
345-
if protobuf_implementation == "cpp":
346-
session.install("protobuf<4")
347-
348332
# Run py.test against the system tests.
349333
if system_test_exists:
350334
session.run(
@@ -354,7 +338,6 @@ def system(session, protobuf_implementation, database_dialect):
354338
system_test_path,
355339
*session.posargs,
356340
env={
357-
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
358341
"SPANNER_DATABASE_DIALECT": database_dialect,
359342
"SKIP_BACKUP_TESTS": "true",
360343
},
@@ -367,7 +350,6 @@ def system(session, protobuf_implementation, database_dialect):
367350
system_test_folder_path,
368351
*session.posargs,
369352
env={
370-
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
371353
"SPANNER_DATABASE_DIALECT": database_dialect,
372354
"SKIP_BACKUP_TESTS": "true",
373355
},
@@ -587,4 +569,4 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
587569
"SPANNER_DATABASE_DIALECT": database_dialect,
588570
"SKIP_BACKUP_TESTS": "true",
589571
},
590-
)
572+
)

0 commit comments

Comments
 (0)