diff options
author | Mehrdad Afshari <mmx@google.com> | 2018-01-02 14:40:00 -0800 |
---|---|---|
committer | Mehrdad Afshari <mmx@google.com> | 2018-01-02 14:40:00 -0800 |
commit | 87cd994b0477e98c976e7b321b3c1f52666ab5e0 (patch) | |
tree | 8590a82e599e0c763f32f835ef2bbb129871e75b /tools/distrib/python | |
parent | 63392f682e21543099926251b642cdcd0be2a17f (diff) |
Upgrade yapf to 0.20.0
Upgrade yapf version to 0.20.0 and reformat Python files.
Diffstat (limited to 'tools/distrib/python')
-rw-r--r-- | tools/distrib/python/grpcio_tools/grpc_tools/command.py | 4 | ||||
-rw-r--r-- | tools/distrib/python/grpcio_tools/setup.py | 6 | ||||
-rwxr-xr-x | tools/distrib/python/make_grpcio_tools.py | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tools/distrib/python/grpcio_tools/grpc_tools/command.py b/tools/distrib/python/grpcio_tools/grpc_tools/command.py index c0f9d93b0a..7ede05f140 100644 --- a/tools/distrib/python/grpcio_tools/grpc_tools/command.py +++ b/tools/distrib/python/grpcio_tools/grpc_tools/command.py @@ -30,8 +30,8 @@ def build_package_protos(package_root): proto_files.append( os.path.abspath(os.path.join(root, filename))) - well_known_protos_include = pkg_resources.resource_filename('grpc_tools', - '_proto') + well_known_protos_include = pkg_resources.resource_filename( + 'grpc_tools', '_proto') for proto_file in proto_files: command = [ diff --git a/tools/distrib/python/grpcio_tools/setup.py b/tools/distrib/python/grpcio_tools/setup.py index 342a220d5e..c6bcee497f 100644 --- a/tools/distrib/python/grpcio_tools/setup.py +++ b/tools/distrib/python/grpcio_tools/setup.py @@ -196,7 +196,8 @@ def extension_modules(): language='c++', define_macros=list(DEFINE_MACROS), extra_compile_args=list(EXTRA_COMPILE_ARGS), - extra_link_args=list(EXTRA_LINK_ARGS),) + extra_link_args=list(EXTRA_LINK_ARGS), + ) extensions = [plugin_ext] if BUILD_WITH_CYTHON: from Cython import Build @@ -220,4 +221,5 @@ setuptools.setup( 'protobuf>=3.5.0.post1', 'grpcio>={version}'.format(version=grpc_version.VERSION), ], - package_data=package_data(),) + package_data=package_data(), +) diff --git a/tools/distrib/python/make_grpcio_tools.py b/tools/distrib/python/make_grpcio_tools.py index 216492a2f3..4847233217 100755 --- a/tools/distrib/python/make_grpcio_tools.py +++ b/tools/distrib/python/make_grpcio_tools.py @@ -107,12 +107,14 @@ def get_deps(): `out_file`.""" cc_files_output = bazel_query(BAZEL_DEPS_PROTOC_LIB_QUERY) cc_files = [ - name[len(PROTOBUF_CC_PREFIX):] for name in cc_files_output + name[len(PROTOBUF_CC_PREFIX):] + for name in cc_files_output if name.endswith('.cc') and name.startswith(PROTOBUF_CC_PREFIX) ] proto_files_output = bazel_query(BAZEL_DEPS_COMMON_PROTOS_QUERY) proto_files = [ - name[len(PROTOBUF_PROTO_PREFIX):] for name in proto_files_output + name[len(PROTOBUF_PROTO_PREFIX):] + for name in proto_files_output if name.endswith('.proto') and name.startswith(PROTOBUF_PROTO_PREFIX) ] commit_hash = protobuf_submodule_commit_hash() |