From c992454355c2c7cb30166df1ffe8a743d4bce9ab Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Fri, 12 Oct 2018 12:11:52 -0700 Subject: [PATCH 1/3] Revert "Rename BUILD files to Bazel convention" This reverts commit 079e25016751169a2aebb1b03ef735d4f63e1d70. --- src/proto/grpc/reflection/v1alpha/{BUILD.bazel => BUILD} | 0 src/proto/grpc/testing/{BUILD.bazel => BUILD} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/proto/grpc/reflection/v1alpha/{BUILD.bazel => BUILD} (100%) rename src/proto/grpc/testing/{BUILD.bazel => BUILD} (100%) diff --git a/src/proto/grpc/reflection/v1alpha/BUILD.bazel b/src/proto/grpc/reflection/v1alpha/BUILD similarity index 100% rename from src/proto/grpc/reflection/v1alpha/BUILD.bazel rename to src/proto/grpc/reflection/v1alpha/BUILD diff --git a/src/proto/grpc/testing/BUILD.bazel b/src/proto/grpc/testing/BUILD similarity index 100% rename from src/proto/grpc/testing/BUILD.bazel rename to src/proto/grpc/testing/BUILD From 45e8ada064b7e95599a4aef5434cdd2ff02d6543 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Fri, 12 Oct 2018 12:12:29 -0700 Subject: [PATCH 2/3] Revert "Bazel rules for Python grpcio_reflection" This reverts commit 2e78e516ad8cb45cff705581625f85e5033b4e5b. --- src/proto/grpc/reflection/v1alpha/BUILD | 8 ----- src/proto/grpc/testing/BUILD | 11 ------ src/proto/grpc/testing/proto2/BUILD.bazel | 30 ---------------- .../grpc_reflection/v1alpha/BUILD.bazel | 34 ------------------- .../grpcio_tests/tests/reflection/BUILD.bazel | 21 ------------ 5 files changed, 104 deletions(-) delete mode 100644 src/proto/grpc/testing/proto2/BUILD.bazel delete mode 100644 src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel delete mode 100644 src/python/grpcio_tests/tests/reflection/BUILD.bazel diff --git a/src/proto/grpc/reflection/v1alpha/BUILD b/src/proto/grpc/reflection/v1alpha/BUILD index 4d919d029ee..4605418447b 100644 --- a/src/proto/grpc/reflection/v1alpha/BUILD +++ b/src/proto/grpc/reflection/v1alpha/BUILD @@ -22,11 +22,3 @@ grpc_proto_library( name = "reflection_proto", srcs = ["reflection.proto"], ) - -filegroup( - name = "reflection_proto_file", - srcs = [ - "reflection.proto", - ], -) - diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD index 7048911b9ae..f6a8f69d24e 100644 --- a/src/proto/grpc/testing/BUILD +++ b/src/proto/grpc/testing/BUILD @@ -15,8 +15,6 @@ licenses(["notice"]) # Apache v2 load("//bazel:grpc_build_system.bzl", "grpc_proto_library", "grpc_package") -load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("@org_pubref_rules_protobuf//python:rules.bzl", "py_proto_library") grpc_package(name = "testing", visibility = "public") @@ -60,15 +58,6 @@ grpc_proto_library( has_services = False, ) -py_proto_library( - name = "py_empty_proto", - protos = ["empty.proto",], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], -) - grpc_proto_library( name = "messages_proto", srcs = ["messages.proto"], diff --git a/src/proto/grpc/testing/proto2/BUILD.bazel b/src/proto/grpc/testing/proto2/BUILD.bazel deleted file mode 100644 index c4c4f004efb..00000000000 --- a/src/proto/grpc/testing/proto2/BUILD.bazel +++ /dev/null @@ -1,30 +0,0 @@ -load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("@org_pubref_rules_protobuf//python:rules.bzl", "py_proto_library") - -package(default_visibility = ["//visibility:public"]) - -py_proto_library( - name = "empty2_proto", - protos = [ - "empty2.proto", - ], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], -) - -py_proto_library( - name = "empty2_extensions_proto", - protos = [ - "empty2_extensions.proto", - ], - proto_deps = [ - ":empty2_proto", - ], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], -) - diff --git a/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel b/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel deleted file mode 100644 index 3a2ba263715..00000000000 --- a/src/python/grpcio_reflection/grpc_reflection/v1alpha/BUILD.bazel +++ /dev/null @@ -1,34 +0,0 @@ -load("@grpc_python_dependencies//:requirements.bzl", "requirement") -load("@org_pubref_rules_protobuf//python:rules.bzl", "py_proto_library") - -package(default_visibility = ["//visibility:public"]) - -genrule( - name = "mv_reflection_proto", - srcs = [ - "//src/proto/grpc/reflection/v1alpha:reflection_proto_file", - ], - outs = ["reflection.proto",], - cmd = "cp $< $@", -) - -py_proto_library( - name = "py_reflection_proto", - protos = [":mv_reflection_proto",], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], -) - -py_library( - name = "grpc_reflection", - srcs = ["reflection.py",], - deps = [ - ":py_reflection_proto", - "//src/python/grpcio/grpc:grpcio", - requirement('protobuf'), - ], - imports=["../../",], -) - diff --git a/src/python/grpcio_tests/tests/reflection/BUILD.bazel b/src/python/grpcio_tests/tests/reflection/BUILD.bazel deleted file mode 100644 index c0efb0b7cef..00000000000 --- a/src/python/grpcio_tests/tests/reflection/BUILD.bazel +++ /dev/null @@ -1,21 +0,0 @@ -load("@grpc_python_dependencies//:requirements.bzl", "requirement") - -package(default_visibility = ["//visibility:public"]) - -py_test( - name="_reflection_servicer_test", - size="small", - timeout="moderate", - srcs=["_reflection_servicer_test.py",], - main="_reflection_servicer_test.py", - deps=[ - "//src/python/grpcio/grpc:grpcio", - "//src/python/grpcio_reflection/grpc_reflection/v1alpha:grpc_reflection", - "//src/python/grpcio_tests/tests/unit:test_common", - "//src/proto/grpc/testing:py_empty_proto", - "//src/proto/grpc/testing/proto2:empty2_extensions_proto", - requirement('protobuf'), - ], - imports=["../../",], -) - From 9d2f985f555718af2ab97eb50b332f06d7abd4f9 Mon Sep 17 00:00:00 2001 From: Mehrdad Afshari Date: Fri, 12 Oct 2018 12:12:36 -0700 Subject: [PATCH 3/3] Revert "Bazel rules for gRPC Python interop tests" This reverts commit 9172775bc82b071acb81f08e81e7d7706a9dee3f. --- requirements.bazel.txt | 1 - src/proto/grpc/testing/BUILD | 23 ----- .../grpcio_tests/tests/interop/BUILD.bazel | 97 ------------------- .../tests/interop/credentials/BUILD.bazel | 9 -- 4 files changed, 130 deletions(-) delete mode 100644 src/python/grpcio_tests/tests/interop/BUILD.bazel delete mode 100644 src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel diff --git a/requirements.bazel.txt b/requirements.bazel.txt index efbf5314afd..16f31f9e94b 100644 --- a/requirements.bazel.txt +++ b/requirements.bazel.txt @@ -8,4 +8,3 @@ wheel>=0.29 futures>=2.2.0 google-auth>=1.0.0 oauth2client==4.1.0 -requests>=2.14.2 diff --git a/src/proto/grpc/testing/BUILD b/src/proto/grpc/testing/BUILD index f6a8f69d24e..16721ff2edc 100644 --- a/src/proto/grpc/testing/BUILD +++ b/src/proto/grpc/testing/BUILD @@ -64,15 +64,6 @@ grpc_proto_library( has_services = False, ) -py_proto_library( - name = "py_messages_proto", - protos = ["messages.proto",], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], -) - grpc_proto_library( name = "metrics_proto", srcs = ["metrics.proto"], @@ -125,17 +116,3 @@ grpc_proto_library( "messages_proto", ], ) - -py_proto_library( - name = "py_test_proto", - protos = ["test.proto",], - with_grpc = True, - deps = [ - requirement('protobuf'), - ], - proto_deps = [ - ":py_empty_proto", - ":py_messages_proto", - ] -) - diff --git a/src/python/grpcio_tests/tests/interop/BUILD.bazel b/src/python/grpcio_tests/tests/interop/BUILD.bazel deleted file mode 100644 index a39f30d32ab..00000000000 --- a/src/python/grpcio_tests/tests/interop/BUILD.bazel +++ /dev/null @@ -1,97 +0,0 @@ -load("@grpc_python_dependencies//:requirements.bzl", "requirement") - -package(default_visibility = ["//visibility:public"]) - -py_library( - name = "_intraop_test_case", - srcs = ["_intraop_test_case.py"], - deps = [ - ":methods", - ], - imports=["../../",], -) - -py_library( - name = "client", - srcs = ["client.py"], - deps = [ - "//src/python/grpcio/grpc:grpcio", - ":methods", - ":resources", - "//src/proto/grpc/testing:py_test_proto", - requirement('google-auth'), - ], - imports=["../../",], -) - -py_library( - name = "methods", - srcs = ["methods.py"], - deps = [ - "//src/python/grpcio/grpc:grpcio", - "//src/proto/grpc/testing:py_empty_proto", - "//src/proto/grpc/testing:py_messages_proto", - "//src/proto/grpc/testing:py_test_proto", - requirement('google-auth'), - requirement('requests'), - requirement('enum34'), - ], - imports=["../../",], -) - -py_library( - name = "resources", - srcs = ["resources.py"], - data = [ - "//src/python/grpcio_tests/tests/interop/credentials", - ], -) - -py_library( - name = "server", - srcs = ["server.py"], - deps = [ - "//src/python/grpcio/grpc:grpcio", - ":methods", - ":resources", - "//src/python/grpcio_tests/tests/unit:test_common", - "//src/proto/grpc/testing:py_test_proto", - ], - imports=["../../",], -) - -py_test( - name="_insecure_intraop_test", - size="small", - srcs=["_insecure_intraop_test.py",], - main="_insecure_intraop_test.py", - deps=[ - "//src/python/grpcio/grpc:grpcio", - ":_intraop_test_case", - ":methods", - ":server", - "//src/python/grpcio_tests/tests/unit:test_common", - "//src/proto/grpc/testing:py_test_proto", - ], - imports=["../../",], - data=[ - "//src/python/grpcio_tests/tests/unit/credentials", - ], -) - -py_test( - name="_secure_intraop_test", - size="small", - srcs=["_secure_intraop_test.py",], - main="_secure_intraop_test.py", - deps=[ - "//src/python/grpcio/grpc:grpcio", - ":_intraop_test_case", - ":methods", - ":server", - "//src/python/grpcio_tests/tests/unit:test_common", - "//src/proto/grpc/testing:py_test_proto", - ], - imports=["../../",], -) - diff --git a/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel b/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel deleted file mode 100644 index bc2b9972927..00000000000 --- a/src/python/grpcio_tests/tests/interop/credentials/BUILD.bazel +++ /dev/null @@ -1,9 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -filegroup( - name="credentials", - srcs=glob([ - "**", - ]), -) -