From 079830c2a677ce6e268dca1cc4b77c4fcf920821 Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Mon, 15 Oct 2018 09:17:31 -0700 Subject: [PATCH 1/3] move bidi --- .../pubsub_v1/subscriber/_protocol => core/google/cloud}/bidi.py | 0 .../unit/pubsub_v1/subscriber => core/tests/unit}/test_bidi.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {pubsub/google/cloud/pubsub_v1/subscriber/_protocol => core/google/cloud}/bidi.py (100%) rename {pubsub/tests/unit/pubsub_v1/subscriber => core/tests/unit}/test_bidi.py (100%) diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/bidi.py b/core/google/cloud/bidi.py similarity index 100% rename from pubsub/google/cloud/pubsub_v1/subscriber/_protocol/bidi.py rename to core/google/cloud/bidi.py diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_bidi.py b/core/tests/unit/test_bidi.py similarity index 100% rename from pubsub/tests/unit/pubsub_v1/subscriber/test_bidi.py rename to core/tests/unit/test_bidi.py From 3bd904a144640c41e1b1b1e56c056e64cd5c04cc Mon Sep 17 00:00:00 2001 From: Chris Wilcox Date: Mon, 15 Oct 2018 09:19:58 -0700 Subject: [PATCH 2/3] modify imports to match new location --- core/tests/unit/test_bidi.py | 2 +- .../pubsub_v1/subscriber/_protocol/streaming_pull_manager.py | 2 +- .../unit/pubsub_v1/subscriber/test_streaming_pull_manager.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/tests/unit/test_bidi.py b/core/tests/unit/test_bidi.py index 058cd53c29cf..a37770612de8 100644 --- a/core/tests/unit/test_bidi.py +++ b/core/tests/unit/test_bidi.py @@ -21,7 +21,7 @@ from six.moves import queue from google.api_core import exceptions -from google.cloud.pubsub_v1.subscriber._protocol import bidi +from google.api_core import bidi class Test_RequestQueueGenerator(object): diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py b/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py index 17d1a2cad166..fdc868b4fa3a 100644 --- a/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py +++ b/pubsub/google/cloud/pubsub_v1/subscriber/_protocol/streaming_pull_manager.py @@ -22,9 +22,9 @@ import grpc import six +from google.api_core import bidi from google.api_core import exceptions from google.cloud.pubsub_v1 import types -from google.cloud.pubsub_v1.subscriber._protocol import bidi from google.cloud.pubsub_v1.subscriber._protocol import dispatcher from google.cloud.pubsub_v1.subscriber._protocol import heartbeater from google.cloud.pubsub_v1.subscriber._protocol import histogram diff --git a/pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py index 15f3bc95db80..4acbf74ea8c0 100644 --- a/pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py +++ b/pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py @@ -17,13 +17,13 @@ import mock import pytest +from google.api_core import bidi from google.api_core import exceptions from google.cloud.pubsub_v1 import types from google.cloud.pubsub_v1.gapic import subscriber_client_config from google.cloud.pubsub_v1.subscriber import client from google.cloud.pubsub_v1.subscriber import message from google.cloud.pubsub_v1.subscriber import scheduler -from google.cloud.pubsub_v1.subscriber._protocol import bidi from google.cloud.pubsub_v1.subscriber._protocol import dispatcher from google.cloud.pubsub_v1.subscriber._protocol import heartbeater from google.cloud.pubsub_v1.subscriber._protocol import leaser From c62538c78179b8d3382e7e7b224132f43a92b7ff Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Mon, 15 Oct 2018 14:48:09 -0400 Subject: [PATCH 3/3] Put 'bidi' in 'api_core', not 'core'. --- {core/google/cloud => api_core/google/api_core}/bidi.py | 0 {core => api_core}/tests/unit/test_bidi.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {core/google/cloud => api_core/google/api_core}/bidi.py (100%) rename {core => api_core}/tests/unit/test_bidi.py (100%) diff --git a/core/google/cloud/bidi.py b/api_core/google/api_core/bidi.py similarity index 100% rename from core/google/cloud/bidi.py rename to api_core/google/api_core/bidi.py diff --git a/core/tests/unit/test_bidi.py b/api_core/tests/unit/test_bidi.py similarity index 100% rename from core/tests/unit/test_bidi.py rename to api_core/tests/unit/test_bidi.py