Skip to content

Commit b3a5557

Browse files
dhermesdhermes
committed
Updating Bigtable and Datastore autogenerate makefiles.
In the process, also updating a hardcoded path in make_datastore_grpc. Also, re-running `make generate` in each of these introduced small changes to the autogenerated bigtable modules.
1 parent 4395b35 commit b3a5557

6 files changed

Lines changed: 15 additions & 14 deletions

File tree

‎Makefile.bigtable_v2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
22
GENERATED_DIR=$(shell pwd)/generated_python
33
GENERATED_SUBDIR=_generated
4-
BIGTABLE_DIR=$(shell pwd)/google/cloud/bigtable/$(GENERATED_SUBDIR)
4+
BIGTABLE_DIR=$(shell pwd)/bigtable/google/cloud/bigtable/$(GENERATED_SUBDIR)
55
PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
66
GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
77

88
help:
9-
@echo 'Makefile for google-cloud-python Bigtable protos '
10-
@echo ' '
11-
@echo ' make generate Generates the protobuf modules '
12-
@echo ' make clean Clean generated files '
9+
@echo 'Makefile for google-cloud-python Bigtable protos '
10+
@echo ' '
11+
@echo ' make generate Generates the protobuf modules'
12+
@echo ' make clean Clean generated files '
1313

1414
generate:
1515
# Ensure we have a virtualenv w/ up-to-date grpcio/grpcio-tools

‎Makefile.datastore‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
22
GENERATED_DIR=$(shell pwd)/generated_python
3-
DATASTORE_DIR=$(shell pwd)/google/cloud/datastore/_generated
3+
DATASTORE_DIR=$(shell pwd)/datastore/google/cloud/datastore/_generated
44
PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
55
GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
66

77
help:
8-
@echo 'Makefile for google-cloud-python Bigtable protos '
9-
@echo ' '
10-
@echo ' make generate Generates the protobuf modules '
11-
@echo ' make clean Clean generated files '
8+
@echo 'Makefile for google-cloud-python Datastore protos '
9+
@echo ' '
10+
@echo ' make generate Generates the protobuf modules'
11+
@echo ' make clean Clean generated files '
1212

1313
generate:
1414
# Ensure we have a virtualenv w/ up-to-date grpcio/grpcio-tools

‎bigtable/google/cloud/bigtable/_generated/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.

‎bigtable/google/cloud/bigtable/_generated/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.

‎bigtable/google/cloud/bigtable/_generated/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.

‎scripts/make_datastore_grpc.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb')
2727
PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore',
2828
'v1', 'datastore.proto')
29-
GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'google', 'cloud', 'datastore',
29+
GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'datastore',
30+
'google', 'cloud', 'datastore',
3031
'_generated', 'datastore_grpc_pb2.py')
3132
GRPCIO_VIRTUALENV = os.getenv('GRPCIO_VIRTUALENV')
3233
if GRPCIO_VIRTUALENV is None:

0 commit comments

Comments
 (0)