Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b5cf005

Browse files
committed
Removing all references to generated_v2.
1 parent 136f190 commit b5cf005

24 files changed

+98
-100
lines changed

.coveragerc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[report]
22
omit =
33
*/_generated/*.py
4-
*/_generated_v2/*.py
54
show_missing = True
65
exclude_lines =
76
# Re-enable the standard pragma

Makefile.bigtable_v2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
22
GENERATED_DIR=$(shell pwd)/generated_python
3-
GENERATED_SUBDIR=_generated_v2
3+
GENERATED_SUBDIR=_generated
44
BIGTABLE_DIR=$(shell pwd)/gcloud/bigtable/$(GENERATED_SUBDIR)
55
PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
66
GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb

gcloud/bigtable/_generated_v2/bigtable_instance_admin_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gcloud/bigtable/_generated_v2/bigtable_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gcloud/bigtable/_generated_v2/bigtable_table_admin_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gcloud/bigtable/_generated_v2/instance_pb2.py

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gcloud/bigtable/client.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131

3232
from grpc.beta import implementations
3333

34-
from gcloud.bigtable._generated_v2 import (
34+
from gcloud.bigtable._generated import (
3535
bigtable_instance_admin_pb2 as instance_admin_v2_pb2)
3636
# V1 table admin service
37-
from gcloud.bigtable._generated_v2 import (
37+
from gcloud.bigtable._generated import (
3838
bigtable_table_admin_pb2 as table_admin_v2_pb2)
3939
# V1 data service
40-
from gcloud.bigtable._generated_v2 import (
40+
from gcloud.bigtable._generated import (
4141
bigtable_pb2 as data_v2_pb2)
4242

43-
from gcloud.bigtable._generated_v2 import (
43+
from gcloud.bigtable._generated import (
4444
operations_grpc_pb2 as operations_grpc_v2_pb2)
4545

4646
from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES

gcloud/bigtable/cluster.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919

2020
from google.longrunning import operations_pb2
2121

22-
from gcloud.bigtable._generated_v2 import (
22+
from gcloud.bigtable._generated import (
2323
instance_pb2 as data_v2_pb2)
24-
from gcloud.bigtable._generated_v2 import (
24+
from gcloud.bigtable._generated import (
2525
bigtable_instance_admin_pb2 as messages_v2_pb2)
2626

2727

@@ -288,7 +288,7 @@ def __ne__(self, other):
288288
def reload(self):
289289
"""Reload the metadata for this cluster."""
290290
request_pb = messages_v2_pb2.GetClusterRequest(name=self.name)
291-
# We expect a `._generated_v2.instance_pb2.Cluster`.
291+
# We expect a `._generated.instance_pb2.Cluster`.
292292
cluster_pb = self._instance._client._instance_stub.GetCluster(
293293
request_pb, self._instance._client.timeout_seconds)
294294

@@ -346,7 +346,7 @@ def update(self):
346346
name=self.name,
347347
serve_nodes=self.serve_nodes,
348348
)
349-
# Ignore expected `._generated_v2.instance_pb2.Cluster`.
349+
# Ignore expected `._generated.instance_pb2.Cluster`.
350350
operation_pb = self._instance._client._instance_stub.UpdateCluster(
351351
request_pb, self._instance._client.timeout_seconds)
352352

gcloud/bigtable/column_family.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
from google.protobuf import duration_pb2
2121

2222
from gcloud._helpers import _total_seconds
23-
from gcloud.bigtable._generated_v2 import (
23+
from gcloud.bigtable._generated import (
2424
table_pb2 as table_v2_pb2)
25-
from gcloud.bigtable._generated_v2 import (
25+
from gcloud.bigtable._generated import (
2626
bigtable_table_admin_pb2 as table_admin_v2_pb2)
2727

2828

gcloud/bigtable/instance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
from google.longrunning import operations_pb2
2121

2222
from gcloud._helpers import _pb_timestamp_to_datetime
23-
from gcloud.bigtable._generated_v2 import (
23+
from gcloud.bigtable._generated import (
2424
instance_pb2 as data_v2_pb2)
25-
from gcloud.bigtable._generated_v2 import (
25+
from gcloud.bigtable._generated import (
2626
bigtable_instance_admin_pb2 as messages_v2_pb2)
27-
from gcloud.bigtable._generated_v2 import (
27+
from gcloud.bigtable._generated import (
2828
bigtable_table_admin_pb2 as table_messages_v2_pb2)
2929
from gcloud.bigtable.cluster import Cluster
3030
from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES

0 commit comments

Comments
 (0)