lint

Author: surbhigarg92

google/cloud/spanner_v1/client.py

@@ -41,7 +41,6 @@
 from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
     InstanceAdminGrpcTransport,
 )
-from google.cloud.spanner_v1 import TransactionOptions
 from google.cloud.spanner_admin_instance_v1 import ListInstanceConfigsRequest
 from google.cloud.spanner_admin_instance_v1 import ListInstancesRequest
 from google.cloud.spanner_v1 import __version__

google/cloud/spanner_v1/session.py

@@ -39,8 +39,6 @@
 from google.cloud.spanner_v1.batch import Batch
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.transaction import Transaction
-from google.cloud.spanner_v1 import TransactionOptions
-
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 
 

noxfile.py

@@ -294,8 +294,18 @@ def install_systemtest_dependencies(session, *constraints):
 
 
 @nox.session(python=SYSTEM_TEST_PYTHON_VERSIONS)
-@nox.parametrize("database_dialect", ["GOOGLE_STANDARD_SQL", "POSTGRESQL"])
-def system(session, database_dialect):
+@nox.parametrize(
+    "protobuf_implementation,database_dialect",
+    [
+        ("python", "GOOGLE_STANDARD_SQL"),
+        ("python", "POSTGRESQL"),
+        ("upb", "GOOGLE_STANDARD_SQL"),
+        ("upb", "POSTGRESQL"),
+        ("cpp", "GOOGLE_STANDARD_SQL"),
+        ("cpp", "POSTGRESQL"),
+    ],
+)
+def system(session, protobuf_implementation, database_dialect):
     """Run the system test suite."""
     constraints_path = str(
         CURRENT_DIRECTORY / "testing" / f"constraints-{session.python}.txt"
@@ -329,6 +339,12 @@ def system(session, database_dialect):
 
     install_systemtest_dependencies(session, "-c", constraints_path)
 
+    # TODO(https://github.com/googleapis/synthtool/issues/1976):
+    # Remove the 'cpp' implementation once support for Protobuf 3.x is dropped.
+    # The 'cpp' implementation requires Protobuf<4.
+    if protobuf_implementation == "cpp":
+        session.install("protobuf<4")
+
     # Run py.test against the system tests.
     if system_test_exists:
         session.run(
@@ -338,6 +354,7 @@ def system(session, database_dialect):
             system_test_path,
             *session.posargs,
             env={
+                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
                 "SPANNER_DATABASE_DIALECT": database_dialect,
                 "SKIP_BACKUP_TESTS": "true",
             },
@@ -350,6 +367,7 @@ def system(session, database_dialect):
             system_test_folder_path,
             *session.posargs,
             env={
+                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
                 "SPANNER_DATABASE_DIALECT": database_dialect,
                 "SKIP_BACKUP_TESTS": "true",
             },

tests/unit/test_session.py

@@ -28,7 +28,6 @@
     Session as SessionRequestProto,
     ExecuteSqlRequest,
     TypeCode,
-    Transaction as TransactionPB,
 )
 from google.cloud._helpers import UTC, _datetime_to_pb_timestamp
 from google.cloud.spanner_v1._helpers import _delay_until_retry
@@ -44,7 +43,6 @@
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.database import Database
 from google.cloud.spanner_v1.keyset import KeySet
-from google.cloud.spanner_v1.transaction import Transaction
 from google.protobuf.duration_pb2 import Duration
 from google.rpc.error_details_pb2 import RetryInfo
 from google.api_core.exceptions import Unknown, Aborted, NotFound, Cancelled