Merge branch 'master' into master

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+### [0.35.11](https://www.github.com/googleapis/gapic-generator-python/compare/v0.35.10...v0.35.11) (2020-11-12)
+
+
+### Bug Fixes
+
+* add enums to types/__init__.py ([#695](https://www.github.com/googleapis/gapic-generator-python/issues/695)) ([e1d4a4a](https://www.github.com/googleapis/gapic-generator-python/commit/e1d4a4ae768a631f6e6dc28f2acfde8be8dc4a8f))
+* update protobuf version [gapic-generator-python] ([#696](https://www.github.com/googleapis/gapic-generator-python/issues/696)) ([ea3e519](https://www.github.com/googleapis/gapic-generator-python/commit/ea3e5198862881f5b142638df6ea604654f81f82))
+
+### [0.35.10](https://www.github.com/googleapis/gapic-generator-python/compare/v0.35.9...v0.35.10) (2020-11-09)
+
+
+### Documentation
+
+* fix a few typos ([#690](https://www.github.com/googleapis/gapic-generator-python/issues/690)) ([2716838](https://www.github.com/googleapis/gapic-generator-python/commit/2716838fb739c9350eee2c95b5cf207c4d83423d))
+
 ### [0.35.9](https://www.github.com/googleapis/gapic-generator-python/compare/v0.35.8...v0.35.9) (2020-10-27)
 
 

docs/getting-started/bazel.rst

@@ -67,9 +67,9 @@ available in the ``google/cloud/documentai/v1beta2/`` subdirectory.
 Creating the Targets
 ~~~~~~~~~~~~~~~~~~~~
 
-To build somethign with bazel you need to create the corresponding tagets in
-your ``BUIDL.bazel`` file. You can use the Python section of the Document AI
-`BUIDL.bazel`_ file as an example:
+To build something with bazel you need to create the corresponding targets in
+your ``BUILD.bazel`` file. You can use the Python section of the Document AI
+`BUILD.bazel`_ file as an example:
 
 .. code-block:: python
 
@@ -94,7 +94,7 @@ your ``BUIDL.bazel`` file. You can use the Python section of the Document AI
             ":documentai_py_gapic",
         ],
     )
-.. _BUIDL.bazel: https://github.com/googleapis/googleapis/blob/master/google/cloud/documentai/v1beta2/BUILD.bazel
+.. _BUILD.bazel: https://github.com/googleapis/googleapis/blob/master/google/cloud/documentai/v1beta2/BUILD.bazel
 
 Compiling an API
 ~~~~~~~~~~~~~~~~

gapic/templates/%namespace/%name_%version/%sub/types/__init__.py.j2

@@ -1,13 +1,22 @@
 {% extends '_base.py.j2' %}
 
 {% block content %}
-{% for p in api.protos.values() if p.file_to_generate and p.messages -%}
-from .{{p.module_name }} import ({% for m in p.messages.values() %}{{ m.name }}, {% endfor %})
-{% endfor %}
+{%- for proto in api.protos.values() if proto.file_to_generate and proto.messages %}
+from .{{proto.module_name }} import (
+  {%- for message in proto.messages.values() %}
+    {{message.name }}, {% endfor %}
+  {%- for enum in proto.enums.values() %}
+    {{ enum.name }}, {% endfor %}
+){% endfor %}
 
 __all__ = (
-  {%- for p in api.protos.values() if p.file_to_generate %}{% for m in p.messages.values() %}
-    '{{ m.name }}',
-  {%- endfor %}{% endfor %}
+  {%- for proto in api.protos.values() if proto.file_to_generate %}
+  {%- for message in proto.messages.values() %}
+    '{{ message.name }}',
+  {%- endfor -%}
+  {%- for enum in proto.enums.values() %}
+    '{{ enum.name }}',
+  {%- endfor -%}
+  {%- endfor %}
 )
 {% endblock %}

repositories.bzl

@@ -16,7 +16,7 @@ def gapic_generator_python():
         requirements = "@gapic_generator_python//:requirements.txt",
     )
 
-    _protobuf_version = "3.11.2"
+    _protobuf_version = "3.13.0"
     _protobuf_version_in_link = "v%s" % _protobuf_version
     _maybe(
         http_archive,

setup.py

@@ -20,7 +20,7 @@
 
 PACKAGE_ROOT = os.path.abspath(os.path.dirname(__file__))
 
-version = "0.35.9"
+version = "0.35.10"
 
 with io.open(os.path.join(PACKAGE_ROOT, "README.rst")) as file_obj:
     README = file_obj.read()