Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,8 @@ release
!config_example.yml
*.json
!test_example.json
**/example/
**/example/

# Python and Rust protobuf SDKs are generated on demand and are not tracked.
/protobuf-py/protobuf/
/protobuf-rs/
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
NAME=wisp
BUILDDIR=build
VERSION ?=Unknown
PYTHON ?=python3
BuildTime:=$(shell date -u '+%Y-%m-%d %I:%M:%S%p')
COMMIT:=$(shell git rev-parse HEAD)
GOVERSION:=$(shell go version)
Expand Down Expand Up @@ -77,7 +78,9 @@ proto_go_dir=./protobuf-go
protobuf_py_dir=./protobuf-py/protobuf

.PHONY: proto
proto: proto-go proto-java proto-rust proto-py
# Go and Java are the protobuf SDKs tracked by this repository.
# Python and Rust remain available as explicit, on-demand targets.
proto: proto-go proto-java

.PHONY: proto-go
proto-go:
Expand All @@ -91,10 +94,12 @@ proto-go:

.PHONY: proto-py
proto-py:
@mkdir -p ./protobuf-py/protobuf
python -m grpc_tools.protoc --proto_path=${proto_path} --python_out=./protobuf-py/protobuf \
--pyi_out=./protobuf-py/protobuf \
--grpc_python_out=./protobuf-py/protobuf \
@mkdir -p ${protobuf_py_dir}
protoc --proto_path=${proto_path} --python_out=${protobuf_py_dir} \
--pyi_out=${protobuf_py_dir} \
${proto_files}
${PYTHON} -m grpc_tools.protoc --proto_path=${proto_path} \
--grpc_python_out=${protobuf_py_dir} \
${proto_files}

.PHONY: proto-java
Expand All @@ -113,4 +118,4 @@ proto-rust:
--plugin=protoc-gen-tonic=$(shell which protoc-gen-tonic) \
--prost_out=./protobuf-rs \
--tonic_out=./protobuf-rs \
${proto_files}
${proto_files}
101 changes: 0 additions & 101 deletions protobuf-py/protobuf/common_pb2.py

This file was deleted.

Loading