Merge pull request #9094 from soltanmm-google/praytell-babbage-if-you-do-the-wrong-thing-will-it-still-do-the-right-thing

Patch overlooked strings from Python un-namespacing
8 years ago · 71f4f205c0
parent d0e336ab58 9fb054a537
commit 71f4f205c0
9 changed files with 9 additions and 9 deletions
--- a/build.yaml
+++ b/build.yaml
@ -7,7 +7,7 @@ settings:
  '#3': Use "-preN" suffixes to identify pre-release versions
  '#4': Per-language overrides are possible with (eg) ruby_version tag here
  '#5': See the expand_version.py for all the quirks here
-  python_version: 1.0.3
+  python_version: 1.0.4
  version: 1.0.1
 filegroups:
 - name: census
--- a/src/python/grpcio/grpc_version.py
+++ b/src/python/grpcio/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio/grpc_version.py.template`!!!

-VERSION='1.0.3'
+VERSION='1.0.4'
--- a/src/python/grpcio_health_checking/MANIFEST.in
+++ b/src/python/grpcio_health_checking/MANIFEST.in
@ -1,4 +1,4 @@
 include grpc_version.py
 include health_commands.py
-graft grpc
+graft grpc_health
 global-exclude *.pyc
--- a/src/python/grpcio_health_checking/grpc_version.py
+++ b/src/python/grpcio_health_checking/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_health_checking/grpc_version.py.template`!!!

-VERSION='1.0.3'
+VERSION='1.0.4'
--- a/src/python/grpcio_tests/grpc_version.py
+++ b/src/python/grpcio_tests/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/src/python/grpcio_tests/grpc_version.py.template`!!!

-VERSION='1.0.3'
+VERSION='1.0.4'
--- a/tools/distrib/python/grpcio_tools/MANIFEST.in
+++ b/tools/distrib/python/grpcio_tools/MANIFEST.in
@ -2,6 +2,6 @@ include grpc_version.py
 include protoc_deps.py
 include protoc_lib_deps.py
 include README.rst
-graft grpc
+graft grpc_tools
 graft grpc_root
 graft third_party
--- a/tools/distrib/python/grpcio_tools/grpc_tools/command.py
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/command.py
@ -45,7 +45,7 @@ def build_package_protos(package_root):

  for proto_file in proto_files:
    command = [
-        'grpc.tools.protoc',
+        'grpc_tools.protoc',
        '--proto_path={}'.format(inclusion_root),
        '--python_out={}'.format(inclusion_root),
        '--grpc_python_out={}'.format(inclusion_root),
--- a/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
+++ b/tools/distrib/python/grpcio_tools/grpc_tools/protoc.py
@ -45,5 +45,5 @@ def main(command_arguments):
  return _protoc_compiler.run_main(command_arguments)

 if __name__ == '__main__':
-  proto_include = pkg_resources.resource_filename('grpc.tools', '_proto')
+  proto_include = pkg_resources.resource_filename('grpc_tools', '_proto')
  sys.exit(main(sys.argv + ['-I{}'.format(proto_include)]))
--- a/tools/distrib/python/grpcio_tools/grpc_version.py
+++ b/tools/distrib/python/grpcio_tools/grpc_version.py
@ -29,4 +29,4 @@

 # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!!

-VERSION='1.0.3'
+VERSION='1.0.4'