From 101ea7798778e6004bb4a7bd7b5a04030b7ff2af Mon Sep 17 00:00:00 2001 From: Sugu Sougoumarane Date: Mon, 23 Mar 2020 11:34:19 -0700 Subject: [PATCH] proto: remove python builds Signed-off-by: Sugu Sougoumarane --- Makefile | 6 +----- go/vt/proto/vtgate/vtgate.pb.go | 3 ++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 959b5f2f83e..b47e3e7bd19 100644 --- a/Makefile +++ b/Makefile @@ -165,11 +165,10 @@ endif PROTO_SRCS = $(wildcard proto/*.proto) PROTO_SRC_NAMES = $(basename $(notdir $(PROTO_SRCS))) -PROTO_PY_OUTS = $(foreach name, $(PROTO_SRC_NAMES), py/vtproto/$(name)_pb2.py) PROTO_GO_OUTS = $(foreach name, $(PROTO_SRC_NAMES), go/vt/proto/$(name)/$(name).pb.go) # This rule rebuilds all the go and python files from the proto definitions for gRPC. -proto: proto_banner $(PROTO_GO_OUTS) $(PROTO_PY_OUTS) +proto: proto_banner $(PROTO_GO_OUTS) proto_banner: ifeq (,$(PROTOC_COMMAND)) @@ -180,9 +179,6 @@ ifndef NOBANNER echo $$(date): Compiling proto definitions endif -$(PROTO_PY_OUTS): py/vtproto/%_pb2.py: proto/%.proto - $(PROTOC_COMMAND) -Iproto $< --python_out=py/vtproto --grpc_python_out=py/vtproto - # TODO(sougou): find a better way around this temp hack. VTTOP=$(VTROOT)/../../.. $(PROTO_GO_OUTS): install_protoc-gen-go proto/*.proto diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go index 43f45d52c17..10786f95d07 100644 --- a/go/vt/proto/vtgate/vtgate.pb.go +++ b/go/vt/proto/vtgate/vtgate.pb.go @@ -5,8 +5,9 @@ package vtgate import ( fmt "fmt" - proto "github.com/golang/protobuf/proto" math "math" + + proto "github.com/golang/protobuf/proto" binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" query "vitess.io/vitess/go/vt/proto/query" topodata "vitess.io/vitess/go/vt/proto/topodata"