From c5892e25ba66e9896051b3f70ce039951831c116 Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Thu, 9 Feb 2017 13:28:17 -0800 Subject: [PATCH 1/2] Rename longrunning.operations* modules. This commit renames the `operations_grpc` and `operations_proto` modules to `operations_grpc_pb2` and `operations_proto_pb2`. This resolves a breaking change in the `protobuf==3.2.0` Python package which requires some objects only to be created in modules that end in `_pb2`. --- .../{operations_grpc.py => operations_grpc_pb2.py} | 0 .../google/longrunning/operations_pb2.py | 4 ++-- .../{operations_proto.py => operations_proto_pb2.py} | 0 generated/python/googleapis-common-protos/setup.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename generated/python/googleapis-common-protos/google/longrunning/{operations_grpc.py => operations_grpc_pb2.py} (100%) rename generated/python/googleapis-common-protos/google/longrunning/{operations_proto.py => operations_proto_pb2.py} (100%) diff --git a/generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py b/generated/python/googleapis-common-protos/google/longrunning/operations_grpc_pb2.py similarity index 100% rename from generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py rename to generated/python/googleapis-common-protos/google/longrunning/operations_grpc_pb2.py diff --git a/generated/python/googleapis-common-protos/google/longrunning/operations_pb2.py b/generated/python/googleapis-common-protos/google/longrunning/operations_pb2.py index 856aa0da0..0c84966c1 100644 --- a/generated/python/googleapis-common-protos/google/longrunning/operations_pb2.py +++ b/generated/python/googleapis-common-protos/google/longrunning/operations_pb2.py @@ -20,6 +20,6 @@ """ try: - from google.longrunning.operations_grpc import * + from google.longrunning.operations_grpc_pb2 import * except ImportError: - from google.longrunning.operations_proto import * + from google.longrunning.operations_proto_pb2 import * diff --git a/generated/python/googleapis-common-protos/google/longrunning/operations_proto.py b/generated/python/googleapis-common-protos/google/longrunning/operations_proto_pb2.py similarity index 100% rename from generated/python/googleapis-common-protos/google/longrunning/operations_proto.py rename to generated/python/googleapis-common-protos/google/longrunning/operations_proto_pb2.py diff --git a/generated/python/googleapis-common-protos/setup.py b/generated/python/googleapis-common-protos/setup.py index 799efb39e..18db0f62f 100644 --- a/generated/python/googleapis-common-protos/setup.py +++ b/generated/python/googleapis-common-protos/setup.py @@ -19,7 +19,7 @@ setuptools.setup( name='googleapis-common-protos', - version='1.5.0', + version='1.5.1', author='Google Inc', author_email='googleapis-packages@google.com', From 572db4b695e0f9c027a84a6b36734f47c5ee18a6 Mon Sep 17 00:00:00 2001 From: Luke Sneeringer Date: Thu, 9 Feb 2017 14:41:16 -0800 Subject: [PATCH 2/2] Support the old import paths; bump version to 1.5.2 --- .../google/longrunning/operations_grpc.py | 5 +++++ .../google/longrunning/operations_proto.py | 5 +++++ generated/python/googleapis-common-protos/setup.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py create mode 100644 generated/python/googleapis-common-protos/google/longrunning/operations_proto.py diff --git a/generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py b/generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py new file mode 100644 index 000000000..43ccb34fa --- /dev/null +++ b/generated/python/googleapis-common-protos/google/longrunning/operations_grpc.py @@ -0,0 +1,5 @@ +# This module is provided for backwards compatibility with +# googleapis-common-protos <= 1.5.0, where this was the import path. + +from __future__ import absolute_import +from google.longrunning.operations_grpc_pb2 import * \ No newline at end of file diff --git a/generated/python/googleapis-common-protos/google/longrunning/operations_proto.py b/generated/python/googleapis-common-protos/google/longrunning/operations_proto.py new file mode 100644 index 000000000..957f0e8ae --- /dev/null +++ b/generated/python/googleapis-common-protos/google/longrunning/operations_proto.py @@ -0,0 +1,5 @@ +# This module is provided for backwards compatibility with +# googleapis-common-protos <= 1.5.0, where this was the import path. + +from __future__ import absolute_import +from google.longrunning.operations_proto_pb2 import * \ No newline at end of file diff --git a/generated/python/googleapis-common-protos/setup.py b/generated/python/googleapis-common-protos/setup.py index 18db0f62f..e62085073 100644 --- a/generated/python/googleapis-common-protos/setup.py +++ b/generated/python/googleapis-common-protos/setup.py @@ -19,7 +19,7 @@ setuptools.setup( name='googleapis-common-protos', - version='1.5.1', + version='1.5.2', author='Google Inc', author_email='googleapis-packages@google.com',