Content-Length: 882192 | pFad | http://github.com/googleapis/google-cloud-python/pull/3068/files

E6 Upgrading all versions for umbrella release. by dhermes · Pull Request #3068 · googleapis/google-cloud-python · GitHub
Skip to content

Upgrading all versions for umbrella release. #3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 24, 2017
Merged

Upgrading all versions for umbrella release. #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dea462f
Upgrading all versions for umbrella release.
dhermes Feb 24, 2017
b3c8a48
Updating datastore imports grpc->proto.
dhermes Feb 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bigquery/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down
4 changes: 2 additions & 2 deletions bigtable/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down
2 changes: 1 addition & 1 deletion core/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/_gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion datastore/google/cloud/datastore/query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions datastore/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down
4 changes: 2 additions & 2 deletions datastore/unit_tests/test__gax.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -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(),
Expand Down
52 changes: 26 additions & 26 deletions datastore/unit_tests/test__http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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()
Expand All @@ -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 = [
Expand Down
14 changes: 7 additions & 7 deletions datastore/unit_tests/test_batch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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 = [
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
Loading








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/googleapis/google-cloud-python/pull/3068/files

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy