From dea462f65b5c04f401e675a4f2d1bea16093a8c3 Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Fri, 24 Feb 2017 11:30:18 -0800 Subject: [PATCH 1/2] Upgrading all versions for umbrella release. --- bigquery/setup.py | 4 ++-- bigtable/setup.py | 4 ++-- core/setup.py | 2 +- datastore/setup.py | 6 +++--- dns/setup.py | 4 ++-- error_reporting/setup.py | 2 +- language/setup.py | 2 +- logging/setup.py | 2 +- monitoring/setup.py | 4 ++-- pubsub/setup.py | 2 +- resource_manager/setup.py | 4 ++-- runtimeconfig/setup.py | 4 ++-- setup.py | 34 ++++++++++++++++++---------------- spanner/setup.py | 4 ++-- speech/setup.py | 4 ++-- storage/setup.py | 4 ++-- translate/setup.py | 4 ++-- vision/setup.py | 2 +- 18 files changed, 47 insertions(+), 45 deletions(-) diff --git a/bigquery/setup.py b/bigquery/setup.py index 21feb33b6888..1c7267d1f523 100644 --- a/bigquery/setup.py +++ b/bigquery/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-bigquery', - version='0.22.1', + version='0.23.0', description='Python Client for Google BigQuery', long_description=README, namespace_packages=[ diff --git a/bigtable/setup.py b/bigtable/setup.py index fc35e8da83b1..06db1ac10ce1 100644 --- a/bigtable/setup.py +++ b/bigtable/setup.py @@ -50,13 +50,13 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', ] setup( name='google-cloud-bigtable', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud Bigtable', long_description=README, namespace_packages=[ diff --git a/core/setup.py b/core/setup.py index 0713f23cc27d..6ec06329bf76 100644 --- a/core/setup.py +++ b/core/setup.py @@ -60,7 +60,7 @@ setup( name='google-cloud-core', - version='0.23.0', + version='0.23.1', description='API Client library for Google Cloud: Core Helpers', long_description=README, namespace_packages=[ diff --git a/datastore/setup.py b/datastore/setup.py index 5d448448efe3..170692218b4f 100644 --- a/datastore/setup.py +++ b/datastore/setup.py @@ -50,14 +50,14 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', - 'gapic-google-cloud-datastore-v1 >= 0.14.0, < 0.15dev', + 'gapic-google-cloud-datastore-v1 >= 0.15.0, < 0.16dev', ] setup( name='google-cloud-datastore', - version='0.22.1', + version='0.23.0', description='Python Client for Google Cloud Datastore', long_description=README, namespace_packages=[ diff --git a/dns/setup.py b/dns/setup.py index c1c60cd69144..7078dc328b0d 100644 --- a/dns/setup.py +++ b/dns/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-dns', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud DNS', long_description=README, namespace_packages=[ diff --git a/error_reporting/setup.py b/error_reporting/setup.py index 6412170fb368..80bde1faedda 100644 --- a/error_reporting/setup.py +++ b/error_reporting/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'google-cloud-logging >= 0.23.0, < 0.24dev', 'gapic-google-cloud-error-reporting-v1beta1 >= 0.15.0, < 0.16dev' ] diff --git a/language/setup.py b/language/setup.py index 9489c19f3028..cdca58c78605 100644 --- a/language/setup.py +++ b/language/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( diff --git a/logging/setup.py b/logging/setup.py index 798542e69d67..ff723043fe09 100644 --- a/logging/setup.py +++ b/logging/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', 'gapic-google-cloud-logging-v2 >= 0.90.1, < 0.91dev', ] diff --git a/monitoring/setup.py b/monitoring/setup.py index e5c9d3e7fdbb..5f98c9884b6e 100644 --- a/monitoring/setup.py +++ b/monitoring/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-monitoring', - version='0.22.0', + version='0.23.0', description='Python Client for Stackdriver Monitoring', long_description=README, namespace_packages=[ diff --git a/pubsub/setup.py b/pubsub/setup.py index 2c69849b3708..9f74c1e49e71 100644 --- a/pubsub/setup.py +++ b/pubsub/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', 'gapic-google-cloud-pubsub-v1 >= 0.15.0, < 0.16dev', ] diff --git a/resource_manager/setup.py b/resource_manager/setup.py index f20d7d58c21f..b8b6813fe393 100644 --- a/resource_manager/setup.py +++ b/resource_manager/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-resource-manager', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud Resource Manager', long_description=README, namespace_packages=[ diff --git a/runtimeconfig/setup.py b/runtimeconfig/setup.py index b4158520c805..10a90b736bb0 100644 --- a/runtimeconfig/setup.py +++ b/runtimeconfig/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-runtimeconfig', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud RuntimeConfig', long_description=README, namespace_packages=[ diff --git a/setup.py b/setup.py index ebd476ff1fda..c19a9ace61a7 100644 --- a/setup.py +++ b/setup.py @@ -50,26 +50,28 @@ REQUIREMENTS = [ - 'google-cloud-bigquery >= 0.22.1, < 0.23dev', - 'google-cloud-bigtable >= 0.22.0, < 0.23dev', - 'google-cloud-core >= 0.23.0, < 0.24dev', - 'google-cloud-datastore >= 0.22.0, < 0.23dev', - 'google-cloud-dns >= 0.22.0, < 0.23dev', - 'google-cloud-error-reporting >= 0.22.0, < 0.23dev', - 'google-cloud-language >= 0.22.1, < 0.23dev', - 'google-cloud-logging >= 0.22.0, < 0.23dev', - 'google-cloud-monitoring >= 0.22.0, < 0.23dev', - 'google-cloud-pubsub >= 0.22.0, < 0.23dev', - 'google-cloud-resource-manager >= 0.22.0, < 0.23dev', - 'google-cloud-storage >= 0.22.0, < 0.23dev', - 'google-cloud-translate >= 0.22.0, < 0.23dev', - 'google-cloud-vision >= 0.22.0, < 0.23dev', - 'google-cloud-runtimeconfig >= 0.22.0, < 0.23dev', + 'google-cloud-bigquery >= 0.23.0, < 0.24dev', + 'google-cloud-bigtable >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', + 'google-cloud-datastore >= 0.23.0, < 0.24dev', + 'google-cloud-dns >= 0.23.0, < 0.24dev', + 'google-cloud-error-reporting >= 0.23.0, < 0.24dev', + 'google-cloud-language >= 0.23.0, < 0.24dev', + 'google-cloud-logging >= 0.23.0, < 0.24dev', + 'google-cloud-monitoring >= 0.23.0, < 0.24dev', + 'google-cloud-pubsub >= 0.23.0, < 0.24dev', + 'google-cloud-resource-manager >= 0.23.0, < 0.24dev', + 'google-cloud-spanner >= 0.23.1, < 0.24dev', + 'google-cloud-speech >= 0.23.0, < 0.24dev', + 'google-cloud-storage >= 0.23.0, < 0.24dev', + 'google-cloud-translate >= 0.23.0, < 0.24dev', + 'google-cloud-vision >= 0.23.0, < 0.24dev', + 'google-cloud-runtimeconfig >= 0.23.0, < 0.24dev', ] setup( name='google-cloud', - version='0.22.0', + version='0.23.0', description='API Client library for Google Cloud', long_description=README, install_requires=REQUIREMENTS, diff --git a/spanner/setup.py b/spanner/setup.py index 2cac3d85a5e8..0d76fb43061b 100644 --- a/spanner/setup.py +++ b/spanner/setup.py @@ -50,7 +50,7 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', 'gapic-google-cloud-spanner-v1 >= 0.15.0, < 0.16dev', 'gapic-google-cloud-spanner-admin-database-v1 >= 0.15.0, < 0.16dev', @@ -59,7 +59,7 @@ setup( name='google-cloud-spanner', - version='0.23.2', + version='0.23.1', description='Python Client for Cloud Spanner', long_description=README, namespace_packages=[ diff --git a/speech/setup.py b/speech/setup.py index 2dd31a32f924..c1c729e592ed 100644 --- a/speech/setup.py +++ b/speech/setup.py @@ -49,9 +49,9 @@ } REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'grpcio >= 1.0.2, < 2.0dev', - 'gapic-google-cloud-speech-v1beta1 >= 0.15.1, < 0.16dev', + 'gapic-google-cloud-speech-v1beta1 >= 0.15.2, < 0.16dev', ] setup( diff --git a/storage/setup.py b/storage/setup.py index a40fa8501284..d26b3b50d2e4 100644 --- a/storage/setup.py +++ b/storage/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-storage', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud Storage', long_description=README, namespace_packages=[ diff --git a/translate/setup.py b/translate/setup.py index 6207c245bec3..923a2132d20f 100644 --- a/translate/setup.py +++ b/translate/setup.py @@ -50,12 +50,12 @@ REQUIREMENTS = [ - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', ] setup( name='google-cloud-translate', - version='0.22.0', + version='0.23.0', description='Python Client for Google Cloud Translation API', long_description=README, namespace_packages=[ diff --git a/vision/setup.py b/vision/setup.py index cbd5dd4bad1c..b83bb8440973 100644 --- a/vision/setup.py +++ b/vision/setup.py @@ -51,7 +51,7 @@ REQUIREMENTS = [ 'enum34', - 'google-cloud-core >= 0.23.0, < 0.24dev', + 'google-cloud-core >= 0.23.1, < 0.24dev', 'gapic-google-cloud-vision-v1 >= 0.15.0, < 0.16dev', ] From b3c8a4866abdb525603de327fc1f68d040d8496f Mon Sep 17 00:00:00 2001 From: Danny Hermes Date: Fri, 24 Feb 2017 12:54:22 -0800 Subject: [PATCH 2/2] Updating datastore imports grpc->proto. Done via: $ cd datastore/ $ git grep -l '\.grpc\.' | xargs sed -i s/'\.grpc\.'/'\.proto\.'/g --- datastore/google/cloud/datastore/_gax.py | 2 +- datastore/google/cloud/datastore/_http.py | 2 +- datastore/google/cloud/datastore/batch.py | 2 +- datastore/google/cloud/datastore/helpers.py | 2 +- datastore/google/cloud/datastore/key.py | 2 +- datastore/google/cloud/datastore/query.py | 2 +- datastore/unit_tests/test__gax.py | 4 +- datastore/unit_tests/test__http.py | 52 +++++++++--------- datastore/unit_tests/test_batch.py | 14 ++--- datastore/unit_tests/test_client.py | 12 ++--- datastore/unit_tests/test_helpers.py | 60 ++++++++++----------- datastore/unit_tests/test_key.py | 2 +- datastore/unit_tests/test_query.py | 26 ++++----- datastore/unit_tests/test_transaction.py | 6 +-- 14 files changed, 94 insertions(+), 94 deletions(-) diff --git a/datastore/google/cloud/datastore/_gax.py b/datastore/google/cloud/datastore/_gax.py index cd2739bd10ce..b29ce874f298 100644 --- a/datastore/google/cloud/datastore/_gax.py +++ b/datastore/google/cloud/datastore/_gax.py @@ -23,7 +23,7 @@ from google.cloud._helpers import make_secure_stub from google.cloud import exceptions -from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc +from google.cloud.proto.datastore.v1 import datastore_pb2_grpc _GRPC_ERROR_MAPPING = { diff --git a/datastore/google/cloud/datastore/_http.py b/datastore/google/cloud/datastore/_http.py index 2f0b27bde952..4c384ad4d4ef 100644 --- a/datastore/google/cloud/datastore/_http.py +++ b/datastore/google/cloud/datastore/_http.py @@ -22,7 +22,7 @@ from google.cloud.environment_vars import DISABLE_GRPC from google.cloud.environment_vars import GCD_HOST from google.cloud import exceptions -from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2 +from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2 from google.cloud.datastore import __version__ try: diff --git a/datastore/google/cloud/datastore/batch.py b/datastore/google/cloud/datastore/batch.py index 484af5a67c76..33cc536cf273 100644 --- a/datastore/google/cloud/datastore/batch.py +++ b/datastore/google/cloud/datastore/batch.py @@ -22,7 +22,7 @@ """ from google.cloud.datastore import helpers -from google.cloud.grpc.datastore.v1 import datastore_pb2 as _datastore_pb2 +from google.cloud.proto.datastore.v1 import datastore_pb2 as _datastore_pb2 class Batch(object): diff --git a/datastore/google/cloud/datastore/helpers.py b/datastore/google/cloud/datastore/helpers.py index 1fe5dd2864cb..36b11d0f8900 100644 --- a/datastore/google/cloud/datastore/helpers.py +++ b/datastore/google/cloud/datastore/helpers.py @@ -26,7 +26,7 @@ from google.cloud._helpers import _datetime_to_pb_timestamp from google.cloud._helpers import _pb_timestamp_to_datetime -from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2 +from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.key import Key diff --git a/datastore/google/cloud/datastore/key.py b/datastore/google/cloud/datastore/key.py index 0af884c67301..5ae08c5642ca 100644 --- a/datastore/google/cloud/datastore/key.py +++ b/datastore/google/cloud/datastore/key.py @@ -17,7 +17,7 @@ import copy import six -from google.cloud.grpc.datastore.v1 import entity_pb2 as _entity_pb2 +from google.cloud.proto.datastore.v1 import entity_pb2 as _entity_pb2 class Key(object): diff --git a/datastore/google/cloud/datastore/query.py b/datastore/google/cloud/datastore/query.py index 9ee565f2f2f2..8342554b558f 100644 --- a/datastore/google/cloud/datastore/query.py +++ b/datastore/google/cloud/datastore/query.py @@ -20,7 +20,7 @@ from google.cloud.iterator import Iterator as BaseIterator from google.cloud.iterator import Page -from google.cloud.grpc.datastore.v1 import query_pb2 as _query_pb2 +from google.cloud.proto.datastore.v1 import query_pb2 as _query_pb2 from google.cloud.datastore import helpers from google.cloud.datastore.key import Key diff --git a/datastore/unit_tests/test__gax.py b/datastore/unit_tests/test__gax.py index 4f49483207d7..e0fc912e0081 100644 --- a/datastore/unit_tests/test__gax.py +++ b/datastore/unit_tests/test__gax.py @@ -126,7 +126,7 @@ def mock_make_stub(*args): return self._get_target_class()(connection, secure) def test_constructor(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc + from google.cloud.proto.datastore.v1 import datastore_pb2_grpc conn = mock.Mock( credentials=object(), @@ -149,7 +149,7 @@ def test_constructor(self): )]) def test_constructor_insecure(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2_grpc + from google.cloud.proto.datastore.v1 import datastore_pb2_grpc conn = mock.Mock( credentials=object(), diff --git a/datastore/unit_tests/test__http.py b/datastore/unit_tests/test__http.py index 690cc45f325e..fffc9c2bdb0b 100644 --- a/datastore/unit_tests/test__http.py +++ b/datastore/unit_tests/test__http.py @@ -139,7 +139,7 @@ def _make_key_pb(self, project, id_=1234): return Key(*path_args, project=project).to_protobuf() def _make_query_pb(self, kind): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 pb = query_pb2.Query() pb.kind.add().name = kind @@ -253,7 +253,7 @@ def test_build_api_url_w_explicit_base_version(self): URI) def test_lookup_single_key_empty_response(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -281,7 +281,7 @@ def test_lookup_single_key_empty_response(self): self.assertEqual(key_pb, keys[0]) def test_lookup_single_key_empty_response_w_eventual(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -321,7 +321,7 @@ def test_lookup_single_key_empty_response_w_eventual_and_transaction(self): eventual=True, transaction_id=TRANSACTION) def test_lookup_single_key_empty_response_w_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'TRANSACTION' @@ -352,8 +352,8 @@ def test_lookup_single_key_empty_response_w_transaction(self): self.assertEqual(request.read_options.transaction, TRANSACTION) def test_lookup_single_key_nonempty_response(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -385,7 +385,7 @@ def test_lookup_single_key_nonempty_response(self): self.assertEqual(key_pb, keys[0]) def test_lookup_multiple_keys_empty_response(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' key_pb1 = self._make_key_pb(PROJECT) @@ -415,7 +415,7 @@ def test_lookup_multiple_keys_empty_response(self): self.assertEqual(key_pb2, keys[1]) def test_lookup_multiple_keys_w_missing(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' key_pb1 = self._make_key_pb(PROJECT) @@ -450,7 +450,7 @@ def test_lookup_multiple_keys_w_missing(self): self.assertEqual(key_pb2, keys[1]) def test_lookup_multiple_keys_w_deferred(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 from google.cloud import _http as connection_module from google.cloud.datastore._http import _CLIENT_INFO @@ -494,8 +494,8 @@ def test_lookup_multiple_keys_w_deferred(self): self.assertEqual(key_pb2, keys[1]) def test_run_query_w_eventual_no_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 project = 'PROJECT' kind = 'Nonesuch' @@ -534,8 +534,8 @@ def test_run_query_w_eventual_no_transaction(self): self.assertEqual(request.read_options.transaction, b'') def test_run_query_wo_eventual_w_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 project = 'PROJECT' kind = 'Nonesuch' @@ -577,8 +577,8 @@ def test_run_query_wo_eventual_w_transaction(self): self.assertEqual(request.read_options.transaction, transaction) def test_run_query_w_eventual_and_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 PROJECT = 'PROJECT' KIND = 'Nonesuch' @@ -595,8 +595,8 @@ def test_run_query_w_eventual_and_transaction(self): eventual=True, transaction_id=TRANSACTION) def test_run_query_wo_namespace_empty_result(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 project = 'PROJECT' kind = 'Nonesuch' @@ -632,9 +632,9 @@ def test_run_query_wo_namespace_empty_result(self): self.assertEqual(request.query, q_pb) def test_run_query_w_namespace_nonempty_result(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 project = 'PROJECT' kind = 'Kind' @@ -670,7 +670,7 @@ def test_run_query_w_namespace_nonempty_result(self): self.assertEqual(request.query, q_pb) def test_begin_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'TRANSACTION' @@ -693,7 +693,7 @@ def test_begin_transaction(self): request.ParseFromString(cw['body']) def test_commit_wo_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 from google.cloud.datastore.helpers import _new_value_pb project = 'PROJECT' @@ -729,7 +729,7 @@ def test_commit_wo_transaction(self): self.assertEqual(request.mode, rq_class.NON_TRANSACTIONAL) def test_commit_w_transaction(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 from google.cloud.datastore.helpers import _new_value_pb project = 'PROJECT' @@ -765,7 +765,7 @@ def test_commit_w_transaction(self): self.assertEqual(request.mode, rq_class.TRANSACTIONAL) def test_rollback_ok(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'xact' @@ -789,7 +789,7 @@ def test_rollback_ok(self): self.assertEqual(request.transaction, TRANSACTION) def test_allocate_ids_empty(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' rsp_pb = datastore_pb2.AllocateIdsResponse() @@ -811,7 +811,7 @@ def test_allocate_ids_empty(self): self.assertEqual(list(request.keys), []) def test_allocate_ids_non_empty(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 PROJECT = 'PROJECT' before_key_pbs = [ diff --git a/datastore/unit_tests/test_batch.py b/datastore/unit_tests/test_batch.py index f2c54c680bef..db62d0436c64 100644 --- a/datastore/unit_tests/test_batch.py +++ b/datastore/unit_tests/test_batch.py @@ -27,7 +27,7 @@ def _make_one(self, client): return self._get_target_class()(client) def test_ctor(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 _PROJECT = 'PROJECT' _NAMESPACE = 'NAMESPACE' @@ -377,8 +377,8 @@ def _call_fut(self, commit_response_pb): return _parse_commit_response(commit_response_pb) def test_it(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 index_updates = 1337 keys = [ @@ -414,7 +414,7 @@ class _Connection(object): _save_result = (False, None) def __init__(self, *new_key_ids): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 self._committed = [] mutation_results = [ @@ -449,7 +449,7 @@ def is_partial(self): return self._id is None def to_protobuf(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = self._key = entity_pb2.Key() # Don't assign it, because it will just get ripped out @@ -507,8 +507,8 @@ def _mutated_pb(test_case, mutation_pb_list, mutation_type): def _make_mutation(id_): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = entity_pb2.Key() key.partition_id.project_id = 'PROJECT' diff --git a/datastore/unit_tests/test_client.py b/datastore/unit_tests/test_client.py index 0102abd7ca02..26a9c56dfcc6 100644 --- a/datastore/unit_tests/test_client.py +++ b/datastore/unit_tests/test_client.py @@ -24,7 +24,7 @@ def _make_credentials(): def _make_entity_pb(project, kind, integer_id, name=None, str_val=None): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() @@ -280,7 +280,7 @@ def test_get_multi_miss(self): self.assertEqual(results, []) def test_get_multi_miss_w_missing(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.key import Key KIND = 'Kind' @@ -344,7 +344,7 @@ def test_get_multi_miss_w_deferred(self): [key.to_protobuf()]) def test_get_multi_w_deferred_from_backend_but_not_passed(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.key import Key @@ -943,7 +943,7 @@ def lookup(self, project, key_pbs, eventual=False, transaction_id=None): return results, missing, deferred def commit(self, project, commit_request, transaction_id): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 self._commit_cw.append((project, commit_request, transaction_id)) keys, self._commit = self._commit[0], self._commit[1:] @@ -1015,7 +1015,7 @@ def is_partial(self): return self._id is None def to_protobuf(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = self._key = entity_pb2.Key() # Don't assign it, because it will just get ripped out @@ -1065,7 +1065,7 @@ def _mutated_pb(test_case, mutation_pb_list, mutation_type): def _make_key(id_): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = entity_pb2.Key() elem = key.path.add() diff --git a/datastore/unit_tests/test_helpers.py b/datastore/unit_tests/test_helpers.py index 2ea54d5afe52..18ff98e64781 100644 --- a/datastore/unit_tests/test_helpers.py +++ b/datastore/unit_tests/test_helpers.py @@ -23,7 +23,7 @@ def _call_fut(self, entity_pb, name): return _new_value_pb(entity_pb, name) def test_it(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 entity_pb = entity_pb2.Entity() name = 'foo' @@ -43,7 +43,7 @@ def _call_fut(self, entity_pb): def test_it(self): import types - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() @@ -66,7 +66,7 @@ def _call_fut(self, val): return entity_from_protobuf(val) def test_it(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb _PROJECT = 'PROJECT' @@ -112,7 +112,7 @@ def test_it(self): self.assertEqual(key.id, _ID) def test_mismatched_value_indexed(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb _PROJECT = 'PROJECT' @@ -136,7 +136,7 @@ def test_mismatched_value_indexed(self): self._call_fut(entity_pb) def test_entity_no_key(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 entity_pb = entity_pb2.Entity() entity = self._call_fut(entity_pb) @@ -145,7 +145,7 @@ def test_entity_no_key(self): self.assertEqual(dict(entity), {}) def test_entity_with_meaning(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() @@ -160,7 +160,7 @@ def test_entity_with_meaning(self): self.assertEqual(entity._meanings, {name: (meaning, val)}) def test_nested_entity_no_key(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb PROJECT = 'FOO' @@ -218,7 +218,7 @@ def _compareEntityProto(self, entity_pb1, entity_pb2): self.assertEqual(val1, val2) def test_empty(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity entity = Entity() @@ -226,7 +226,7 @@ def test_empty(self): self._compareEntityProto(entity_pb, entity_pb2.Entity()) def test_key_only(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.key import Key @@ -245,7 +245,7 @@ def test_key_only(self): self._compareEntityProto(entity_pb, expected_pb) def test_simple_fields(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.helpers import _new_value_pb @@ -265,7 +265,7 @@ def test_simple_fields(self): self._compareEntityProto(entity_pb, expected_pb) def test_with_empty_list(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity entity = Entity() @@ -275,7 +275,7 @@ def test_with_empty_list(self): self._compareEntityProto(entity_pb, entity_pb2.Entity()) def test_inverts_to_protobuf(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import _new_value_pb from google.cloud.datastore.helpers import entity_from_protobuf @@ -328,7 +328,7 @@ def test_inverts_to_protobuf(self): self._compareEntityProto(original_pb, new_pb) def test_meaning_with_change(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.helpers import _new_value_pb @@ -346,7 +346,7 @@ def test_meaning_with_change(self): self._compareEntityProto(entity_pb, expected_pb) def test_variable_meanings(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.helpers import _new_value_pb @@ -380,7 +380,7 @@ def _call_fut(self, val): return key_from_protobuf(val) def _makePB(self, project=None, namespace=None, path=()): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 pb = entity_pb2.Key() if project is not None: @@ -553,7 +553,7 @@ def _call_fut(self, pb): return _get_value_from_value_pb(pb) def _makePB(self, attr_name, value): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 pb = entity_pb2.Value() setattr(pb, attr_name, value) @@ -563,7 +563,7 @@ def test_datetime(self): import calendar import datetime from google.cloud._helpers import UTC - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 micros = 4375 utc = datetime.datetime(2014, 9, 16, 10, 19, 32, micros, UTC) @@ -573,7 +573,7 @@ def test_datetime(self): self.assertEqual(self._call_fut(pb), utc) def test_key(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.key import Key pb = entity_pb2.Value() @@ -603,7 +603,7 @@ def test_unicode(self): self.assertEqual(self._call_fut(pb), u'str') def test_entity(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.entity import Entity from google.cloud.datastore.helpers import _new_value_pb @@ -619,7 +619,7 @@ def test_entity(self): self.assertEqual(entity['foo'], 'Foo') def test_array(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 pb = entity_pb2.Value() array_pb = pb.array_value.values @@ -632,7 +632,7 @@ def test_array(self): def test_geo_point(self): from google.type import latlng_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 from google.cloud.datastore.helpers import GeoPoint lat = -3.14 @@ -646,14 +646,14 @@ def test_geo_point(self): def test_null(self): from google.protobuf import struct_pb2 - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 pb = entity_pb2.Value(null_value=struct_pb2.NULL_VALUE) result = self._call_fut(pb) self.assertIsNone(result) def test_unknown(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 pb = entity_pb2.Value() with self.assertRaises(ValueError): @@ -668,7 +668,7 @@ def _call_fut(self, value_pb, val): return _set_protobuf_value(value_pb, val) def _makePB(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 return entity_pb2.Value() def test_datetime(self): @@ -808,14 +808,14 @@ def _call_fut(self, *args, **kwargs): return _get_meaning(*args, **kwargs) def test_no_meaning(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() result = self._call_fut(value_pb) self.assertIsNone(result) def test_single(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() value_pb.meaning = meaning = 22 @@ -824,7 +824,7 @@ def test_single(self): self.assertEqual(meaning, result) def test_empty_array_value(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() value_pb.array_value.values.add() @@ -834,7 +834,7 @@ def test_empty_array_value(self): self.assertEqual(None, result) def test_array_value(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() meaning = 9 @@ -849,7 +849,7 @@ def test_array_value(self): self.assertEqual(meaning, result) def test_array_value_multiple_meanings(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() meaning1 = 9 @@ -866,7 +866,7 @@ def test_array_value_multiple_meanings(self): self.assertEqual(result, [meaning1, meaning2]) def test_array_value_meaning_partially_unset(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 value_pb = entity_pb2.Value() meaning1 = 9 diff --git a/datastore/unit_tests/test_key.py b/datastore/unit_tests/test_key.py index c699ec773885..904338368c02 100644 --- a/datastore/unit_tests/test_key.py +++ b/datastore/unit_tests/test_key.py @@ -315,7 +315,7 @@ def test_completed_key_on_complete(self): self.assertRaises(ValueError, key.completed_key, 5678) def test_to_protobuf_defaults(self): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 _KIND = 'KIND' key = self._make_one(_KIND, project=self._DEFAULT_PROJECT) diff --git a/datastore/unit_tests/test_query.py b/datastore/unit_tests/test_query.py index a02e166aba33..fdf18a858775 100644 --- a/datastore/unit_tests/test_query.py +++ b/datastore/unit_tests/test_query.py @@ -397,7 +397,7 @@ def test_constructor_explicit(self): self.assertTrue(iterator._more_results) def test__build_protobuf_empty(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 from google.cloud.datastore.query import Query client = _Client(None, None) @@ -409,7 +409,7 @@ def test__build_protobuf_empty(self): self.assertEqual(pb, expected_pb) def test__build_protobuf_all_values(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 from google.cloud.datastore.query import Query client = _Client(None, None) @@ -437,7 +437,7 @@ def test__build_protobuf_all_values(self): self.assertEqual(pb, expected_pb) def test__process_query_results(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 iterator = self._make_one(None, None, end_cursor='abcd') @@ -460,7 +460,7 @@ def test__process_query_results(self): self.assertTrue(iterator._more_results) def test__process_query_results_done(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 iterator = self._make_one(None, None, end_cursor='abcd') @@ -491,7 +491,7 @@ def test__process_query_results_bad_enum(self): def test__next_page(self): from google.cloud.iterator import Page - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 from google.cloud.datastore.query import Query connection = _Connection() @@ -561,7 +561,7 @@ def _call_fut(self, query): return _pb_from_query(query) def test_empty(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 pb = self._call_fut(_Query()) self.assertEqual(list(pb.projection), []) @@ -589,7 +589,7 @@ def test_kind(self): def test_ancestor(self): from google.cloud.datastore.key import Key - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 ancestor = Key('Ancestor', 123, project='PROJECT') pb = self._call_fut(_Query(ancestor=ancestor)) @@ -602,7 +602,7 @@ def test_ancestor(self): self.assertEqual(pfilter.value.key_value, ancestor_pb) def test_filter(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 query = _Query(filters=[('name', '=', u'John')]) query.OPERATORS = { @@ -618,7 +618,7 @@ def test_filter(self): def test_filter_key(self): from google.cloud.datastore.key import Key - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 key = Key('Kind', 123, project='PROJECT') query = _Query(filters=[('__key__', '=', key)]) @@ -635,7 +635,7 @@ def test_filter_key(self): self.assertEqual(pfilter.value.key_value, key_pb) def test_order(self): - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 pb = self._call_fut(_Query(order=['a', '-b', 'c'])) self.assertEqual([item.property.name for item in pb.order], @@ -703,7 +703,7 @@ def current_transaction(self): def _make_entity(kind, id_, project): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = entity_pb2.Key() key.partition_id.project_id = project @@ -715,8 +715,8 @@ def _make_entity(kind, id_, project): def _make_query_response( entity_pbs, cursor_as_bytes, more_results_enum, skipped_results): - from google.cloud.grpc.datastore.v1 import datastore_pb2 - from google.cloud.grpc.datastore.v1 import query_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import query_pb2 return datastore_pb2.RunQueryResponse( batch=query_pb2.QueryResultBatch( diff --git a/datastore/unit_tests/test_transaction.py b/datastore/unit_tests/test_transaction.py index 4dec32420356..a4d278a421c3 100644 --- a/datastore/unit_tests/test_transaction.py +++ b/datastore/unit_tests/test_transaction.py @@ -27,7 +27,7 @@ def _make_one(self, client, **kw): return self._get_target_class()(client, **kw) def test_ctor_defaults(self): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 _PROJECT = 'PROJECT' connection = _Connection() @@ -179,7 +179,7 @@ class Foo(Exception): def _make_key(kind, id_, project): - from google.cloud.grpc.datastore.v1 import entity_pb2 + from google.cloud.proto.datastore.v1 import entity_pb2 key = entity_pb2.Key() key.partition_id.project_id = project @@ -197,7 +197,7 @@ class _Connection(object): _side_effect = None def __init__(self, xact_id=123, keys=()): - from google.cloud.grpc.datastore.v1 import datastore_pb2 + from google.cloud.proto.datastore.v1 import datastore_pb2 self._xact_id = xact_id mutation_results = [