Skip to content

Commit cecefda

Browse files
Luke Sneeringerlukesneeringer
authored andcommitted
[refactor] Use proto-plus 0.3.0.
This moves from `Meta` inner classes to a property on the module, which is an overall improvement (not repeating the same thing over and over, no weird `__all__` magic).
1 parent d8af4b7 commit cecefda

File tree

3 files changed

+16
-10
lines changed

3 files changed

+16
-10
lines changed

packages/gapic-generator/gapic/templates/$namespace/$name_$version/$sub/types/$proto.py.j2

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,30 @@ import proto{% if p != 'proto' %} as {{ p }}{% endif -%}
1414
{{ import_ }}
1515
{% endfor %}
1616

17-
__all__ = (
17+
__protobuf__ = {{ p }}.module(
18+
package='{{ '.'.join(proto.meta.address.package) }}',
19+
{% if api.naming.proto_package != '.'.join(proto.meta.address.package) -%}
20+
marshal='{{ api.naming.proto_package }}',
21+
{% endif -%}
22+
manifest={
1823
{%- for enum in proto.top.enums.values() %}
19-
'{{ enum.name }}',
20-
{%- endfor -%}
24+
'{{ enum.name }}',
25+
{%- endfor %}
2126
{%- for message in proto.top.messages.values() %}
22-
'{{ message.name }}',
27+
'{{ message.name }}',
2328
{%- endfor %}
29+
},
2430
)
2531

32+
2633
{% for enum in proto.top.enums.values() -%}
2734
{% include '$namespace/$name_$version/$sub/types/_enum.py.j2' with context %}
2835
{% endfor %}
2936

3037
{% for message in proto.top.messages.values() -%}
3138
{% include "$namespace/$name_$version/$sub/types/_message.py.j2" with context %}
3239
{% endfor %}
33-
{% endwith %}{% endblock %}
40+
{% endwith %}
41+
42+
__all__ = tuple(sorted(__protobuf__.manifest))
43+
{% endblock %}

packages/gapic-generator/gapic/templates/$namespace/$name_$version/$sub/types/_message.py.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@ class {{ message.name }}({{ p }}.Message):
2020
{% endif %})
2121
"""{{ field.meta.doc|rst(indent=4) }}"""
2222
{% endfor %}
23-
24-
class Meta:
25-
package = '{{ message.ident.proto_package }}'
26-
marshal = '{{ api.naming.warehouse_package_name }}'
2723
{{ '\n\n' }}

packages/gapic-generator/gapic/templates/setup.py.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ setuptools.setup(
2222
'google-api-core >= 1.3.0, < 2.0.0dev',
2323
'googleapis-common-protos >= 1.6.0b6',
2424
'grpcio >= 1.10.0',
25-
'proto-plus >= 0.2.1',
25+
'proto-plus >= 0.3.0',
2626
),
2727
classifiers=[
2828
'Development Status :: 3 - Alpha',

0 commit comments

Comments
 (0)