Skip to content

Commit

Permalink
Merge pull request #1999 from dhermes/remove-bigtable-v1
Browse files Browse the repository at this point in the history
Remove old/unused Bigtable v1 generated code
  • Loading branch information
dhermes committed Jul 21, 2016
2 parents e8487bf + 5d8ec27 commit a316dd6
Show file tree
Hide file tree
Showing 59 changed files with 319 additions and 6,154 deletions.
1 change: 0 additions & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[report]
omit =
*/_generated/*.py
*/_generated_v2/*.py
show_missing = True
exclude_lines =
# Re-enable the standard pragma
Expand Down
81 changes: 0 additions & 81 deletions Makefile.bigtable_v1

This file was deleted.

8 changes: 2 additions & 6 deletions Makefile.bigtable_v2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv
GENERATED_DIR=$(shell pwd)/generated_python
GENERATED_SUBDIR=_generated_v2
GENERATED_SUBDIR=_generated
BIGTABLE_DIR=$(shell pwd)/gcloud/bigtable/$(GENERATED_SUBDIR)
PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc
GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb
Expand All @@ -9,7 +9,6 @@ help:
@echo 'Makefile for gcloud-python Bigtable protos '
@echo ' '
@echo ' make generate Generates the protobuf modules '
@echo ' make check_generate Checks that generate succeeded '
@echo ' make clean Clean generated files '

generate:
Expand Down Expand Up @@ -62,10 +61,7 @@ generate:
# Rewrite the imports in the generated *_pb2.py files.
python scripts/rewrite_imports.py $(BIGTABLE_DIR)/*pb2.py

check_generate:
python scripts/check_generate.py

clean:
rm -fr $(GRPCIO_VIRTUALENV) $(GOOGLEAPIS_PROTOS_DIR) $(GENERATED_DIR)

.PHONY: generate check_generate clean
.PHONY: generate clean
6 changes: 1 addition & 5 deletions Makefile.datastore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ help:
@echo 'Makefile for gcloud-python Bigtable protos '
@echo ' '
@echo ' make generate Generates the protobuf modules '
@echo ' make check_generate Checks that generate succeeded '
@echo ' make clean Clean generated files '

generate:
Expand Down Expand Up @@ -48,10 +47,7 @@ generate:
# Rewrite the imports in the generated *_pb2.py files.
python scripts/rewrite_imports.py $(DATASTORE_DIR)/*pb2.py

check_generate:
python scripts/check_generate.py

clean:
rm -fr $(GENERATED_DIR)

.PHONY: generate check_generate clean
.PHONY: generate clean
File renamed without changes.
93 changes: 0 additions & 93 deletions gcloud/bigtable/_generated/_bigtable_cluster_data.proto

This file was deleted.

129 changes: 0 additions & 129 deletions gcloud/bigtable/_generated/_bigtable_cluster_service.proto

This file was deleted.

Loading

0 comments on commit a316dd6

Please sign in to comment.