fix: shadowed Python PubSub v2 proto dependency (#231)

GoogleCloudPlatform · Aug 18, 2020 · 537b7e0 · 537b7e0
1 parent 6fef86b
commit 537b7e0
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/load-test-framework/python_src/clients/cps_publisher_task.py b/load-test-framework/python_src/clients/cps_publisher_task.py
@@ -21,8 +21,8 @@
 from clients.metrics_tracker import MessageAndDuration
 import grpc
 from concurrent import futures
-from proto.loadtest_pb2 import StartRequest
-from proto.loadtest_pb2_grpc import add_LoadtestWorkerServicer_to_server
+from proto_dir.loadtest_pb2 import StartRequest
+from proto_dir.loadtest_pb2_grpc import add_LoadtestWorkerServicer_to_server
 from clients.loadtest_worker_servicer import LoadtestWorkerServicer
 import sys
 from clients.flow_control import FlowController, RateLimiterFlowController, OutstandingCountFlowController

diff --git a/load-test-framework/python_src/clients/cps_subscriber_task.py b/load-test-framework/python_src/clients/cps_subscriber_task.py
@@ -20,8 +20,8 @@
 import grpc
 from concurrent import futures
 
-from proto.loadtest_pb2 import StartRequest
-from proto.loadtest_pb2_grpc import add_LoadtestWorkerServicer_to_server
+from proto_dir.loadtest_pb2 import StartRequest
+from proto_dir.loadtest_pb2_grpc import add_LoadtestWorkerServicer_to_server
 from clients.loadtest_worker_servicer import LoadtestWorkerServicer
 import sys
 

diff --git a/load-test-framework/python_src/clients/loadtest_worker_servicer.py b/load-test-framework/python_src/clients/loadtest_worker_servicer.py
@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from proto.loadtest_pb2 import StartResponse
-from proto import loadtest_pb2_grpc
+from proto_dir.loadtest_pb2 import StartResponse
+from proto_dir import loadtest_pb2_grpc
 from clients.task import Task
 from concurrent.futures import Executor, ThreadPoolExecutor
 import time

diff --git a/load-test-framework/python_src/clients/metrics_tracker.py b/load-test-framework/python_src/clients/metrics_tracker.py
@@ -17,7 +17,7 @@
 from typing import List
 import sys
 
-from proto.loadtest_pb2 import CheckResponse
+from proto_dir.loadtest_pb2 import CheckResponse
 
 
 class MessageAndDuration:

diff --git a/load-test-framework/python_src/clients/task.py b/load-test-framework/python_src/clients/task.py
@@ -21,12 +21,12 @@
 
 import grpc
 
-from proto.loadtest_pb2 import StartRequest, StartResponse, CheckRequest, CheckResponse
+from proto_dir.loadtest_pb2 import StartRequest, StartResponse, CheckRequest, CheckResponse
 from multiprocessing import Queue, Process, cpu_count
 from clients.metrics_tracker import MetricsTracker, combine_responses
 import sys
 
-from proto.loadtest_pb2_grpc import LoadtestWorkerServicer, add_LoadtestWorkerServicer_to_server, LoadtestWorkerStub
+from proto_dir.loadtest_pb2_grpc import LoadtestWorkerServicer, add_LoadtestWorkerServicer_to_server, LoadtestWorkerStub
 
 
 class SubtaskWorker(LoadtestWorkerServicer):

diff --git a/...st-framework/python_src/proto/__init__.py → ...ramework/python_src/proto_dir/__init__.py b/...st-framework/python_src/proto/__init__.py → ...ramework/python_src/proto_dir/__init__.py
diff --git a/...ramework/python_src/proto/loadtest_pb2.py → ...work/python_src/proto_dir/loadtest_pb2.py b/...ramework/python_src/proto/loadtest_pb2.py → ...work/python_src/proto_dir/loadtest_pb2.py
diff --git a/...ork/python_src/proto/loadtest_pb2_grpc.py → ...python_src/proto_dir/loadtest_pb2_grpc.py b/...ork/python_src/proto/loadtest_pb2_grpc.py → ...python_src/proto_dir/loadtest_pb2_grpc.py
@@ -15,7 +15,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
 
-from proto import loadtest_pb2 as loadtest__pb2
+from proto_dir import loadtest_pb2 as loadtest__pb2
 
 
 class LoadtestWorkerStub(object):