From e7afadc255745153b2a762dc49ab34556143b964 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 22 Dec 2020 13:08:19 -0800 Subject: [PATCH 1/2] Refactor examples BUILD files --- examples/BUILD | 252 --------------------- examples/cpp/compression/BUILD | 35 +++ examples/cpp/helloworld/BUILD | 66 ++++++ examples/cpp/keyvaluestore/BUILD | 38 ++++ examples/cpp/load_balancing/BUILD | 35 +++ examples/cpp/metadata/BUILD | 35 +++ examples/cpp/route_guide/BUILD | 56 +++++ examples/objective-c/BUILD | 12 +- examples/objective-c/helloworld/README.md | 2 +- examples/protos/BUILD | 83 +++++++ examples/python/compression/BUILD.bazel | 8 +- examples/python/debug/BUILD.bazel | 12 +- examples/python/errors/BUILD.bazel | 8 +- examples/python/wait_for_ready/BUILD.bazel | 4 +- 14 files changed, 371 insertions(+), 275 deletions(-) delete mode 100644 examples/BUILD create mode 100644 examples/cpp/compression/BUILD create mode 100644 examples/cpp/helloworld/BUILD create mode 100644 examples/cpp/keyvaluestore/BUILD create mode 100644 examples/cpp/load_balancing/BUILD create mode 100644 examples/cpp/metadata/BUILD create mode 100644 examples/cpp/route_guide/BUILD create mode 100644 examples/protos/BUILD diff --git a/examples/BUILD b/examples/BUILD deleted file mode 100644 index 16448404bdc..00000000000 --- a/examples/BUILD +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 2017 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -licenses(["notice"]) # 3-clause BSD - -package(default_visibility = ["//visibility:public"]) - -load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("@rules_proto//proto:defs.bzl", "proto_library") -load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") -load("//bazel:grpc_build_system.bzl", "grpc_proto_library") -load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") - -grpc_proto_library( - name = "auth_sample", - srcs = ["protos/auth_sample.proto"], -) - -grpc_proto_library( - name = "hellostreamingworld", - srcs = ["protos/hellostreamingworld.proto"], -) - -# The following three rules demonstrate the usage of the cc_grpc_library rule in -# in a mode compatible with the native proto_library and cc_proto_library rules. -proto_library( - name = "helloworld_proto", - srcs = ["protos/helloworld.proto"], -) - -cc_proto_library( - name = "helloworld_cc_proto", - deps = [":helloworld_proto"], -) - -cc_grpc_library( - name = "helloworld_cc_grpc", - srcs = [":helloworld_proto"], - grpc_only = True, - deps = [":helloworld_cc_proto"], -) - -grpc_proto_library( - name = "route_guide", - srcs = ["protos/route_guide.proto"], -) - -proto_library( - name = "keyvaluestore_proto", - srcs = ["protos/keyvaluestore.proto"], -) - -grpc_proto_library( - name = "keyvaluestore", - srcs = ["protos/keyvaluestore.proto"], -) - -proto_library( - name = "protos/helloworld_proto", - srcs = ["protos/helloworld.proto"], -) - -py_proto_library( - name = "helloworld_py_pb2", - deps = [":protos/helloworld_proto"], -) - -py_grpc_library( - name = "helloworld_py_pb2_grpc", - srcs = [":protos/helloworld_proto"], - deps = [":helloworld_py_pb2"], -) - -cc_binary( - name = "greeter_client", - srcs = ["cpp/helloworld/greeter_client.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "greeter_async_client", - srcs = ["cpp/helloworld/greeter_async_client.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "greeter_async_client2", - srcs = ["cpp/helloworld/greeter_async_client2.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "greeter_server", - srcs = ["cpp/helloworld/greeter_server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - "//:grpc++_reflection", - ], -) - -cc_binary( - name = "greeter_async_server", - srcs = ["cpp/helloworld/greeter_async_server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "metadata_client", - srcs = ["cpp/metadata/greeter_client.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "metadata_server", - srcs = ["cpp/metadata/greeter_server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "lb_client", - srcs = ["cpp/load_balancing/greeter_client.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "lb_server", - srcs = ["cpp/load_balancing/greeter_server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "compression_client", - srcs = ["cpp/compression/greeter_client.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "compression_server", - srcs = ["cpp/compression/greeter_server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":helloworld_cc_grpc", - "//:grpc++", - ], -) - -cc_binary( - name = "keyvaluestore_client", - srcs = [ - "cpp/keyvaluestore/caching_interceptor.h", - "cpp/keyvaluestore/client.cc", - ], - defines = ["BAZEL_BUILD"], - deps = [ - ":keyvaluestore", - "//:grpc++", - ], -) - -cc_binary( - name = "keyvaluestore_server", - srcs = ["cpp/keyvaluestore/server.cc"], - defines = ["BAZEL_BUILD"], - deps = [ - ":keyvaluestore", - "//:grpc++", - ], -) - -cc_binary( - name = "route_guide_client", - srcs = [ - "cpp/route_guide/helper.cc", - "cpp/route_guide/helper.h", - "cpp/route_guide/route_guide_client.cc", - ], - data = ["cpp/route_guide/route_guide_db.json"], - defines = ["BAZEL_BUILD"], - deps = [ - ":route_guide", - "//:grpc++", - ], -) - -cc_binary( - name = "route_guide_server", - srcs = [ - "cpp/route_guide/helper.cc", - "cpp/route_guide/helper.h", - "cpp/route_guide/route_guide_server.cc", - ], - data = ["cpp/route_guide/route_guide_db.json"], - defines = ["BAZEL_BUILD"], - deps = [ - ":route_guide", - "//:grpc++", - ], -) - -proto_library( - name = "route_guide_proto", - srcs = ["protos/route_guide.proto"], -) diff --git a/examples/cpp/compression/BUILD b/examples/cpp/compression/BUILD new file mode 100644 index 00000000000..8df2ecb694f --- /dev/null +++ b/examples/cpp/compression/BUILD @@ -0,0 +1,35 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_binary( + name = "compression_client", + srcs = ["greeter_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "compression_server", + srcs = ["greeter_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) diff --git a/examples/cpp/helloworld/BUILD b/examples/cpp/helloworld/BUILD new file mode 100644 index 00000000000..ac13e5282ff --- /dev/null +++ b/examples/cpp/helloworld/BUILD @@ -0,0 +1,66 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_binary( + name = "greeter_client", + srcs = ["greeter_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "greeter_async_client", + srcs = ["greeter_async_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "greeter_async_client2", + srcs = ["greeter_async_client2.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "greeter_server", + srcs = ["greeter_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//:grpc++_reflection", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "greeter_async_server", + srcs = ["greeter_async_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) diff --git a/examples/cpp/keyvaluestore/BUILD b/examples/cpp/keyvaluestore/BUILD new file mode 100644 index 00000000000..ac1fec2f908 --- /dev/null +++ b/examples/cpp/keyvaluestore/BUILD @@ -0,0 +1,38 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_binary( + name = "keyvaluestore_client", + srcs = [ + "caching_interceptor.h", + "client.cc", + ], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:keyvaluestore", + ], +) + +cc_binary( + name = "keyvaluestore_server", + srcs = ["server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:keyvaluestore", + ], +) diff --git a/examples/cpp/load_balancing/BUILD b/examples/cpp/load_balancing/BUILD new file mode 100644 index 00000000000..52c07fdda0c --- /dev/null +++ b/examples/cpp/load_balancing/BUILD @@ -0,0 +1,35 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_binary( + name = "lb_server", + srcs = ["greeter_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "lb_client", + srcs = ["greeter_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) diff --git a/examples/cpp/metadata/BUILD b/examples/cpp/metadata/BUILD new file mode 100644 index 00000000000..90cb90c5eb8 --- /dev/null +++ b/examples/cpp/metadata/BUILD @@ -0,0 +1,35 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_binary( + name = "metadata_client", + srcs = ["greeter_client.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) + +cc_binary( + name = "metadata_server", + srcs = ["greeter_server.cc"], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:helloworld_cc_grpc", + ], +) diff --git a/examples/cpp/route_guide/BUILD b/examples/cpp/route_guide/BUILD new file mode 100644 index 00000000000..8aac557c44c --- /dev/null +++ b/examples/cpp/route_guide/BUILD @@ -0,0 +1,56 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +cc_library( + name = "route_guide_helper", + srcs = [ + "helper.cc", + "helper.h", + ], + defines = ["BAZEL_BUILD"], + deps = [ + "//:grpc++", + "//examples/protos:route_guide", + ], +) + +cc_binary( + name = "route_guide_client", + srcs = [ + "route_guide_client.cc", + ], + data = ["route_guide_db.json"], + defines = ["BAZEL_BUILD"], + deps = [ + ":route_guide_helper", + "//:grpc++", + "//examples/protos:route_guide", + ], +) + +cc_binary( + name = "route_guide_server", + srcs = [ + "route_guide_server.cc", + ], + data = ["route_guide_db.json"], + defines = ["BAZEL_BUILD"], + deps = [ + ":route_guide_helper", + "//:grpc++", + "//examples/protos:route_guide", + ], +) diff --git a/examples/objective-c/BUILD b/examples/objective-c/BUILD index 988a317c1e4..965da49496b 100644 --- a/examples/objective-c/BUILD +++ b/examples/objective-c/BUILD @@ -22,17 +22,17 @@ load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application") objc_grpc_library( name = "HelloWorld_grpc_proto", - srcs = ["//examples:protos/helloworld.proto"], + srcs = ["//examples/protos:helloworld.proto"], tags = ["manual"], - deps = ["//examples:helloworld_proto"], + deps = ["//examples/protos:helloworld_proto"], ) # This one works with import "external/com_github_grpc_grpc/examples/protos/Keyvaluestore.pbrpc.h" objc_grpc_library( name = "Keyvaluestore_grpc_proto_external", - srcs = ["//external/com_github_grpc_grpc/examples:protos/keyvaluestore.proto"], + srcs = ["//external/com_github_grpc_grpc/examples/protos:keyvaluestore.proto"], tags = ["manual"], - deps = ["@com_github_grpc_grpc//examples:keyvaluestore_proto"], + deps = ["@com_github_grpc_grpc//examples/protos:keyvaluestore_proto"], ) objc_library( @@ -86,9 +86,9 @@ macos_application( objc_grpc_library( name = "RouteGuide", - srcs = ["//examples:protos/route_guide.proto"], + srcs = ["//examples/protos:route_guide.proto"], tags = ["manual"], - deps = ["//examples:route_guide_proto"], + deps = ["//examples/protos:route_guide_proto"], ) objc_library( diff --git a/examples/objective-c/helloworld/README.md b/examples/objective-c/helloworld/README.md index 2fa390dc917..9142de9ca43 100644 --- a/examples/objective-c/helloworld/README.md +++ b/examples/objective-c/helloworld/README.md @@ -84,7 +84,7 @@ $ bazel build :HelloWorld #### Try it! To run the Hello World sample properly, we need a local server. Let's compile and run the corresponding C++ server: ```shell -$ bazel run //examples:greeter_server +$ bazel run //examples/cpp/helloworld:greeter_server ``` To run the sample, you need to know the available simulator runtimes in your machine. You could either list the available runtimes yourself by running: diff --git a/examples/protos/BUILD b/examples/protos/BUILD new file mode 100644 index 00000000000..5418b88e6f8 --- /dev/null +++ b/examples/protos/BUILD @@ -0,0 +1,83 @@ +# Copyright 2020 the gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +licenses(["notice"]) # 3-clause BSD + +package(default_visibility = ["//visibility:public"]) + +load("@grpc_python_dependencies//:requirements.bzl", "requirement") +load("@rules_proto//proto:defs.bzl", "proto_library") +load("//bazel:cc_grpc_library.bzl", "cc_grpc_library") +load("//bazel:grpc_build_system.bzl", "grpc_proto_library") +load("//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library") + +grpc_proto_library( + name = "auth_sample", + srcs = ["auth_sample.proto"], +) + +grpc_proto_library( + name = "hellostreamingworld", + srcs = ["hellostreamingworld.proto"], +) + +# The following three rules demonstrate the usage of the cc_grpc_library rule in +# in a mode compatible with the native proto_library and cc_proto_library rules. +proto_library( + name = "helloworld_proto", + srcs = ["helloworld.proto"], +) + +cc_proto_library( + name = "helloworld_cc_proto", + deps = [":helloworld_proto"], +) + +cc_grpc_library( + name = "helloworld_cc_grpc", + srcs = [":helloworld_proto"], + grpc_only = True, + deps = [":helloworld_cc_proto"], +) + +grpc_proto_library( + name = "route_guide", + srcs = ["route_guide.proto"], +) + +proto_library( + name = "keyvaluestore_proto", + srcs = ["keyvaluestore.proto"], +) + +grpc_proto_library( + name = "keyvaluestore", + srcs = ["keyvaluestore.proto"], +) + +py_proto_library( + name = "helloworld_py_pb2", + deps = [":helloworld_proto"], +) + +py_grpc_library( + name = "helloworld_py_pb2_grpc", + srcs = [":helloworld_proto"], + deps = [":helloworld_py_pb2"], +) + +proto_library( + name = "route_guide_proto", + srcs = [":route_guide.proto"], +) diff --git a/examples/python/compression/BUILD.bazel b/examples/python/compression/BUILD.bazel index 1ab1d5a2a37..beba230ba5f 100644 --- a/examples/python/compression/BUILD.bazel +++ b/examples/python/compression/BUILD.bazel @@ -18,8 +18,8 @@ py_binary( python_version = "PY3", srcs_version = "PY2AND3", deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], ) @@ -30,8 +30,8 @@ py_binary( python_version = "PY3", srcs_version = "PY2AND3", deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], ) diff --git a/examples/python/debug/BUILD.bazel b/examples/python/debug/BUILD.bazel index 029f78d551a..0459647b945 100644 --- a/examples/python/debug/BUILD.bazel +++ b/examples/python/debug/BUILD.bazel @@ -19,8 +19,8 @@ py_binary( testonly = 1, srcs = ["debug_server.py"], deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", ], @@ -32,8 +32,8 @@ py_binary( srcs = ["send_message.py"], python_version = "PY3", deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], ) @@ -57,8 +57,8 @@ py_test( ":debug_server", ":get_stats", ":send_message", - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_channelz/grpc_channelz/v1:grpc_channelz", ], diff --git a/examples/python/errors/BUILD.bazel b/examples/python/errors/BUILD.bazel index a6aacd75a8f..cdd056e91fd 100644 --- a/examples/python/errors/BUILD.bazel +++ b/examples/python/errors/BUILD.bazel @@ -19,8 +19,8 @@ py_library( testonly = 1, srcs = ["client.py"], deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_status/grpc_status", requirement("googleapis-common-protos"), @@ -34,8 +34,8 @@ py_library( deps = [ "//src/python/grpcio/grpc:grpcio", "//src/python/grpcio_status/grpc_status:grpc_status", - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", ] + select({ "//conditions:default": [requirement("futures")], "//:python3": [], diff --git a/examples/python/wait_for_ready/BUILD.bazel b/examples/python/wait_for_ready/BUILD.bazel index 0892b36790e..d9a278457c9 100644 --- a/examples/python/wait_for_ready/BUILD.bazel +++ b/examples/python/wait_for_ready/BUILD.bazel @@ -19,8 +19,8 @@ py_library( testonly = 1, srcs = ["wait_for_ready_example.py"], deps = [ - "//examples:helloworld_py_pb2", - "//examples:helloworld_py_pb2_grpc", + "//examples/protos:helloworld_py_pb2", + "//examples/protos:helloworld_py_pb2_grpc", "//src/python/grpcio/grpc:grpcio", ], ) From e0ebe46ad34704df7e09a02ce0bb39df20421146 Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 22 Dec 2020 15:20:11 -0800 Subject: [PATCH 2/2] Fix python examples --- examples/python/compression/client.py | 4 ++-- examples/python/compression/server.py | 4 ++-- examples/python/debug/debug_server.py | 4 ++-- examples/python/debug/send_message.py | 4 ++-- examples/python/errors/client.py | 4 ++-- examples/python/errors/server.py | 4 ++-- examples/python/errors/test/_error_handling_example_test.py | 2 +- examples/python/wait_for_ready/wait_for_ready_example.py | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/examples/python/compression/client.py b/examples/python/compression/client.py index 5d7a2aeec52..3de9d9e7305 100644 --- a/examples/python/compression/client.py +++ b/examples/python/compression/client.py @@ -21,8 +21,8 @@ import argparse import logging import grpc -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc _DESCRIPTION = 'A client capable of compression.' _COMPRESSION_OPTIONS = { diff --git a/examples/python/compression/server.py b/examples/python/compression/server.py index 15fb0d0f56f..935b044e1c8 100644 --- a/examples/python/compression/server.py +++ b/examples/python/compression/server.py @@ -23,8 +23,8 @@ import logging import threading import grpc -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc _DESCRIPTION = 'A server capable of compression.' _COMPRESSION_OPTIONS = { diff --git a/examples/python/debug/debug_server.py b/examples/python/debug/debug_server.py index ce78fe33d8d..9e47a83895a 100644 --- a/examples/python/debug/debug_server.py +++ b/examples/python/debug/debug_server.py @@ -25,8 +25,8 @@ import random import grpc from grpc_channelz.v1 import channelz -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc _LOGGER = logging.getLogger(__name__) _LOGGER.setLevel(logging.INFO) diff --git a/examples/python/debug/send_message.py b/examples/python/debug/send_message.py index 63cc60a572f..9ca85375d16 100644 --- a/examples/python/debug/send_message.py +++ b/examples/python/debug/send_message.py @@ -20,8 +20,8 @@ from __future__ import print_function import logging import argparse import grpc -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc def process(stub, request): diff --git a/examples/python/errors/client.py b/examples/python/errors/client.py index c762d798dc2..a79b8fce1bd 100644 --- a/examples/python/errors/client.py +++ b/examples/python/errors/client.py @@ -20,8 +20,8 @@ import grpc from grpc_status import rpc_status from google.rpc import error_details_pb2 -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc _LOGGER = logging.getLogger(__name__) diff --git a/examples/python/errors/server.py b/examples/python/errors/server.py index 096d2170db5..c410367034c 100644 --- a/examples/python/errors/server.py +++ b/examples/python/errors/server.py @@ -23,8 +23,8 @@ from grpc_status import rpc_status from google.protobuf import any_pb2 from google.rpc import code_pb2, status_pb2, error_details_pb2 -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc def create_greet_limit_exceed_error_status(name): diff --git a/examples/python/errors/test/_error_handling_example_test.py b/examples/python/errors/test/_error_handling_example_test.py index 9eb81ba3742..a79ca45e2a1 100644 --- a/examples/python/errors/test/_error_handling_example_test.py +++ b/examples/python/errors/test/_error_handling_example_test.py @@ -26,7 +26,7 @@ import logging import grpc -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2_grpc from examples.python.errors import client as error_handling_client from examples.python.errors import server as error_handling_server diff --git a/examples/python/wait_for_ready/wait_for_ready_example.py b/examples/python/wait_for_ready/wait_for_ready_example.py index db2aeaf6665..bddb0ac9205 100644 --- a/examples/python/wait_for_ready/wait_for_ready_example.py +++ b/examples/python/wait_for_ready/wait_for_ready_example.py @@ -22,8 +22,8 @@ import threading import grpc -from examples import helloworld_pb2 -from examples import helloworld_pb2_grpc +from examples.protos import helloworld_pb2 +from examples.protos import helloworld_pb2_grpc _LOGGER = logging.getLogger(__name__) _LOGGER.setLevel(logging.INFO)