From bcd3f54c4c8636b688ea53b04dd292d67397312b Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 26 Jan 2021 21:22:05 +0000 Subject: [PATCH 01/11] chore: release 0.40.3 (#747) :robot: I have created a release \*beep\* \*boop\* --- ### [0.40.3](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.2...v0.40.3) (2021-01-21) ### Bug Fixes * stabilize order of query_params ([#742](https://www.github.com/googleapis/gapic-generator-python/issues/742)) ([2835ddb](https://www.github.com/googleapis/gapic-generator-python/commit/2835ddbe62b520e2e4c84f02810b1ac936c9cbb9)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f127e33a2d..f19d635297 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.40.3](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.2...v0.40.3) (2021-01-21) + + +### Bug Fixes + +* stabilize order of query_params ([#742](https://www.github.com/googleapis/gapic-generator-python/issues/742)) ([2835ddb](https://www.github.com/googleapis/gapic-generator-python/commit/2835ddbe62b520e2e4c84f02810b1ac936c9cbb9)) + ### [0.40.2](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.1...v0.40.2) (2021-01-21) From 608275aa923f495520dea8ebddb94a99f26e27a5 Mon Sep 17 00:00:00 2001 From: yon-mg <71726126+yon-mg@users.noreply.github.com> Date: Thu, 28 Jan 2021 14:03:33 -0800 Subject: [PATCH 02/11] fix: mypy 0.800 update errors (#754) --- .../tests/unit/gapic/%name_%version/%sub/__init__.py | 0 gapic/templates/noxfile.py.j2 | 1 + noxfile.py | 2 +- 3 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/__init__.py diff --git a/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/__init__.py b/gapic/ads-templates/tests/unit/gapic/%name_%version/%sub/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/gapic/templates/noxfile.py.j2 b/gapic/templates/noxfile.py.j2 index ee97ea01cb..b6225d867d 100644 --- a/gapic/templates/noxfile.py.j2 +++ b/gapic/templates/noxfile.py.j2 @@ -32,6 +32,7 @@ def mypy(session): session.install('.') session.run( 'mypy', + '--explicit-package-bases', {%- if api.naming.module_namespace %} '{{ api.naming.module_namespace[0] }}', {%- else %} diff --git a/noxfile.py b/noxfile.py index a50376efe1..7dbe33ebc3 100644 --- a/noxfile.py +++ b/noxfile.py @@ -227,7 +227,7 @@ def showcase_mypy( session.chdir(lib) # Run the tests. - session.run("mypy", "google") + session.run("mypy", "--explicit-package-bases", "google") @nox.session(python="3.8") From 45212afb9f523a416d86272798d71ce05dc292f0 Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Thu, 28 Jan 2021 14:43:54 -0800 Subject: [PATCH 03/11] fix: Make gapic-generator-python compatible with protobuf 3.14.0 (packaged as native namespace package) (#753) More details about Python namespace packaging here: https://packaging.python.org/guides/packaging-namespace-packages/#native-namespace-packages The protobuf changes, which made this fix necessary are here: https://github.com/protocolbuffers/protobuf/pull/7902 https://github.com/protocolbuffers/protobuf/pull/7908 The tracking bug for this issue (probably not the only one) https://github.com/googleapis/gapic-generator/issues/3334 This is only part of the fix, for the proper fix other google-namespaced python packages must be migrated to [pkgutil-style-namespace-packages](https://packaging.python.org/guides/packaging-namespace-packages/#pkgutil-style-namespace-packages) and make sure they **do not** have `namespace_packages` in their `setup.py` file (an artifact from the legacy `pkg_resources-style`packages) --- BUILD.bazel | 2 +- WORKSPACE | 6 ++---- repositories.bzl | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index 0ec34987b0..8fb9dd587b 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -57,8 +57,8 @@ py_binary( python_version = "PY3", visibility = ["//visibility:public"], deps = [ - "@com_google_protobuf//:protobuf_python", "@com_github_grpc_grpc//src/python/grpcio/grpc:grpcio", + requirement("protobuf"), requirement("click"), requirement("google-api-core"), requirement("googleapis-common-protos"), diff --git a/WORKSPACE b/WORKSPACE index d6fa214f2b..9475af113b 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -44,11 +44,9 @@ load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps") grpc_deps() -load("@upb//bazel:repository_defs.bzl", "bazel_version_repository") +load("@com_github_grpc_grpc//bazel:grpc_extra_deps.bzl", "grpc_extra_deps") -bazel_version_repository( - name = "bazel_version", -) +grpc_extra_deps() load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies") diff --git a/repositories.bzl b/repositories.bzl index 38ad41907e..c6af87d4bc 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -15,7 +15,7 @@ def gapic_generator_python(): requirements = "@gapic_generator_python//:requirements.txt", ) - _protobuf_version = "3.13.0" + _protobuf_version = "3.14.0" _protobuf_version_in_link = "v%s" % _protobuf_version _maybe( http_archive, From 6bd6415536b33b0a6586df996b0f5ae451db0500 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Fri, 29 Jan 2021 08:38:27 -0700 Subject: [PATCH 04/11] chore: release 0.40.4 (#755) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f19d635297..bb26bfcb9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +### [0.40.4](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.3...v0.40.4) (2021-01-28) + + +### Bug Fixes + +* Make gapic-generator-python compatible with protobuf 3.14.0 (packaged as native namespace package) ([#753](https://www.github.com/googleapis/gapic-generator-python/issues/753)) ([45212af](https://www.github.com/googleapis/gapic-generator-python/commit/45212afb9f523a416d86272798d71ce05dc292f0)) +* mypy 0.800 update errors ([#754](https://www.github.com/googleapis/gapic-generator-python/issues/754)) ([608275a](https://www.github.com/googleapis/gapic-generator-python/commit/608275aa923f495520dea8ebddb94a99f26e27a5)) + ### [0.40.3](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.2...v0.40.3) (2021-01-21) From 8035662bdcfbdffd1c294c5d28479733358407ca Mon Sep 17 00:00:00 2001 From: Vadym Matsishevskyi <25311427+vam-google@users.noreply.github.com> Date: Mon, 1 Feb 2021 11:19:20 -0800 Subject: [PATCH 05/11] fix: Fix namespace packages conflict issue (#757) * fix: Fix namespace packages conflict issue This fixes the https://github.com/googleapis/gapic-generator/issues/3334 by excluding system-wide site-packages dir from python packages resolution path completely. This pretty much implements the long-standing featrue request for rules_python https://github.com/bazelbuild/bazel/issues/4939, but only in scope of gapic-generator-python. * Format with autopep8 --- gapic/cli/generate_with_pandoc.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gapic/cli/generate_with_pandoc.py b/gapic/cli/generate_with_pandoc.py index 264d1c8b0b..4a31f76292 100644 --- a/gapic/cli/generate_with_pandoc.py +++ b/gapic/cli/generate_with_pandoc.py @@ -1,9 +1,14 @@ import os - -from gapic.cli import generate +import sys if __name__ == '__main__': os.environ['PYPANDOC_PANDOC'] = os.path.join( os.path.abspath(__file__).rsplit("gapic", 1)[0], "pandoc") os.environ['LC_ALL'] = 'C.UTF-8' - generate.generate() + os.environ['PYTHONNOUSERSITE'] = 'True' + + entry_point_script = os.path.join( + os.path.dirname(os.path.abspath(__file__)), "generate.py") + args = [sys.executable, entry_point_script] + sys.argv[1:] + + os.execv(args[0], args) From dfa29e2c83a57ef3e48e1d52aa0fbc126ef00ab0 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 1 Feb 2021 12:23:39 -0700 Subject: [PATCH 06/11] chore: release 0.40.5 (#759) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb26bfcb9f..df99e6f750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.40.5](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.4...v0.40.5) (2021-02-01) + + +### Bug Fixes + +* Fix namespace packages conflict issue ([#757](https://www.github.com/googleapis/gapic-generator-python/issues/757)) ([8035662](https://www.github.com/googleapis/gapic-generator-python/commit/8035662bdcfbdffd1c294c5d28479733358407ca)) + ### [0.40.4](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.3...v0.40.4) (2021-01-28) From 944136c5ed11af03b1960ac1f0db9f4d0733b381 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 1 Feb 2021 20:50:03 +0100 Subject: [PATCH 07/11] chore(deps): update dependency jinja2 to v2.11.3 (#758) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [jinja2](https://palletsprojects.com/p/jinja/) ([source](https://togithub.com/pallets/jinja)) | `==2.11.2` -> `==2.11.3` | [![age](https://badges.renovateapi.com/packages/pypi/jinja2/2.11.3/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/pypi/jinja2/2.11.3/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/pypi/jinja2/2.11.3/compatibility-slim/2.11.2)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/pypi/jinja2/2.11.3/confidence-slim/2.11.2)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes
pallets/jinja ### [`v2.11.3`](https://togithub.com/pallets/jinja/blob/master/CHANGES.rst#Version-2113) [Compare Source](https://togithub.com/pallets/jinja/compare/2.11.2...2.11.3) Released 2021-01-31 - Improve the speed of the `urlize` filter by reducing regex backtracking. Email matching requires a word character at the start of the domain part, and only word characters in the TLD. :pr:`1343`
--- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/gapic-generator-python). --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ba548cf684..7784cde09b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ click==7.1.2 google-api-core==1.25.0 googleapis-common-protos==1.52.0 -jinja2==2.11.2 +jinja2==2.11.3 MarkupSafe==1.1.1 protobuf==3.14.0 pypandoc==1.5 From cdbc22130a176e733c529f60a6b8b1d224e82e89 Mon Sep 17 00:00:00 2001 From: Dov Shlachter Date: Tue, 2 Feb 2021 09:46:05 -0800 Subject: [PATCH 08/11] fix: remove duplicate assignment of certain flattened, repeated fields (#760) Fix for #756. Under certain circumstances, flattened, repeated fields could be duplicated during request construction. --- .../%sub/services/%service/client.py.j2 | 28 +++++++++---------- gapic/ads-templates/noxfile.py.j2 | 4 +-- gapic/ads-templates/setup.py.j2 | 1 - .../%sub/services/%service/client.py.j2 | 18 ++++++------ 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2 index 4d2f0abebb..2f36e5058b 100644 --- a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2 +++ b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/client.py.j2 @@ -341,9 +341,9 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): raise ValueError('If the `request` argument is set, then none of ' 'the individual field arguments should be set.') - {% endif -%} + {% endif -%} {# method.flattened_fields #} {% if method.input.ident.package != method.ident.package -%} {# request lives in a different package, so there is no proto wrapper #} - # The request isn't a proto-plus wrapped type, + # The request isn't a proto-plus wrapped type. # so it must be constructed via keyword expansion. if isinstance(request, dict): request = {{ method.input.ident }}(**request) @@ -351,7 +351,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): elif not request: request = {{ method.input.ident }}({% if method.input.ident.package != method.ident.package %}{% for f in method.flattened_fields.values() %}{{ f.name }}={{ f.name }}, {% endfor %}{% endif %}) {% endif -%}{# Cross-package req and flattened fields #} - {%- else %} + {%- else %} {# Request is in _our_ package #} # Minor optimization to avoid making a copy if the user passes # in a {{ method.input.ident }}. # There's no risk of modifying the input as we've already verified @@ -364,22 +364,22 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): # If we have keyword arguments corresponding to fields on the # request, apply these. {% endif -%} - {%- for key, field in method.flattened_fields.items() if not(field.repeated and method.input.ident.package != method.ident.package) %} + {%- for key, field in method.flattened_fields.items() if not field.repeated or method.input.ident.package == method.ident.package %} if {{ field.name }} is not None: request.{{ key }} = {{ field.name }} {%- endfor %} {# Map-y fields can be _updated_, however #} - {%- for key, field in method.flattened_fields.items() if field.map and method.input.ident.package == method.ident.package %} - + {%- for key, field in method.flattened_fields.items() if field.repeated and method.input.ident.package != method.ident.package %} + {%- if field.map %} {# map implies repeated, but repeated does NOT imply map#} if {{ field.name }}: request.{{ key }}.update({{ field.name }}) - {%- endfor %} + {%- else %} {# And list-y fields can be _extended_ -#} - {%- for key, field in method.flattened_fields.items() if field.repeated and not field.map and method.input.ident.package == method.ident.package %} if {{ field.name }}: request.{{ key }}.extend({{ field.name }}) - {%- endfor %} - {%- endif %} + {%- endif %} {# field.map #} + {%- endfor %} {# key, field in method.flattened_fields.items() #} + {%- endif %} {# method.client_streaming #} # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. @@ -397,7 +397,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): {%- endfor %} )), ) - {%- endif %} + {%- endif %} {# method.field_headers #} # Send the request. {% if not method.void %}response = {% endif %}rpc( @@ -405,7 +405,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): request, {%- else %} requests, - {%- endif %} + {%- endif %} {# method.client_streaming #} retry=retry, timeout=timeout, metadata=metadata, @@ -429,12 +429,12 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): response=response, metadata=metadata, ) - {%- endif %} + {%- endif %} {# method.lro #} {%- if not method.void %} # Done; return the response. return response - {%- endif %} + {%- endif %} {# method.void #} {{ '\n' }} {% endfor %} diff --git a/gapic/ads-templates/noxfile.py.j2 b/gapic/ads-templates/noxfile.py.j2 index 4760bc548b..36dcd2b2e1 100644 --- a/gapic/ads-templates/noxfile.py.j2 +++ b/gapic/ads-templates/noxfile.py.j2 @@ -6,7 +6,7 @@ import os import nox # type: ignore -@nox.session(python=['3.6', '3.7']) +@nox.session(python=['3.7', '3.8']) def unit(session): """Run the unit test suite.""" @@ -24,7 +24,7 @@ def unit(session): ) -@nox.session(python=['3.6', '3.7']) +@nox.session(python=['3.7', '3.8']) def mypy(session): """Run the type checker.""" session.install('mypy') diff --git a/gapic/ads-templates/setup.py.j2 b/gapic/ads-templates/setup.py.j2 index 92ae4ea7af..18f06803dd 100644 --- a/gapic/ads-templates/setup.py.j2 +++ b/gapic/ads-templates/setup.py.j2 @@ -35,7 +35,6 @@ setuptools.setup( 'Development Status :: 3 - Alpha', 'Intended Audience :: Developers', 'Operating System :: OS Independent', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Topic :: Internet', diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 index ada75471b0..d7073af7d0 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/client.py.j2 @@ -244,7 +244,7 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): if use_client_cert: if client_options.client_cert_source: is_mtls = True - client_cert_source_func = client_options.client_cert_source + client_cert_source_func = client_options.client_cert_source else: is_mtls = mtls.has_default_client_cert_source() client_cert_source_func = mtls.default_client_cert_source() if is_mtls else None @@ -381,22 +381,22 @@ class {{ service.client_name }}(metaclass={{ service.client_name }}Meta): # If we have keyword arguments corresponding to fields on the # request, apply these. {% endif -%} - {%- for key, field in method.flattened_fields.items() if not field.repeated and method.input.ident.package == method.ident.package %} + {%- for key, field in method.flattened_fields.items() if not field.repeated or method.input.ident.package == method.ident.package %} if {{ field.name }} is not None: request.{{ key }} = {{ field.name }} {%- endfor %} - {# Map-y fields can be _updated_, however #} - {%- for key, field in method.flattened_fields.items() if field.map and method.input.ident.package == method.ident.package %} - + {# Map-y fields can be _updated_, however #} + {%- for key, field in method.flattened_fields.items() if field.repeated and method.input.ident.package != method.ident.package %} + {%- if field.map %} {# map implies repeated, but repeated does NOT imply map#} if {{ field.name }}: request.{{ key }}.update({{ field.name }}) - {%- endfor %} + {%- else %} {# And list-y fields can be _extended_ -#} - {%- for key, field in method.flattened_fields.items() if field.repeated and not field.map and method.input.ident.package == method.ident.package %} if {{ field.name }}: request.{{ key }}.extend({{ field.name }}) - {%- endfor %} - {%- endif %} + {%- endif %} {# field.map #} + {%- endfor %} {# method.flattened_fields.items() #} + {%- endif %} {# method.client_streaming #} # Wrap the RPC method; this adds retry and timeout information, # and friendly error handling. From aaabb277f2c44c332586bb98e4dd683a482bb4fa Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 2 Feb 2021 18:06:04 +0000 Subject: [PATCH 09/11] chore: release 0.40.6 (#762) :robot: I have created a release \*beep\* \*boop\* --- ### [0.40.6](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.5...v0.40.6) (2021-02-02) ### Bug Fixes * remove duplicate assignment of certain flattened, repeated fields ([#760](https://www.github.com/googleapis/gapic-generator-python/issues/760)) ([cdbc221](https://www.github.com/googleapis/gapic-generator-python/commit/cdbc22130a176e733c529f60a6b8b1d224e82e89)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index df99e6f750..acd91750a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.40.6](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.5...v0.40.6) (2021-02-02) + + +### Bug Fixes + +* remove duplicate assignment of certain flattened, repeated fields ([#760](https://www.github.com/googleapis/gapic-generator-python/issues/760)) ([cdbc221](https://www.github.com/googleapis/gapic-generator-python/commit/cdbc22130a176e733c529f60a6b8b1d224e82e89)) + ### [0.40.5](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.4...v0.40.5) (2021-02-01) From 6d37a7388995b90428ee6293bcce5d48cd9a48f8 Mon Sep 17 00:00:00 2001 From: yon-mg <71726126+yon-mg@users.noreply.github.com> Date: Wed, 3 Feb 2021 08:10:03 -0800 Subject: [PATCH 10/11] fix: don't use integer for enums in json encoding (#761) --- .../%sub/services/%service/transports/rest.py.j2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 index 54ec5ca92e..7e84b78a99 100644 --- a/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 +++ b/gapic/templates/%namespace/%name_%version/%sub/services/%service/transports/rest.py.j2 @@ -157,11 +157,13 @@ class {{ service.name }}RestTransport({{ service.name }}Transport): {%- if method.http_opt['body'] != '*' %} body = {{ method.input.fields[method.http_opt['body']].type.ident }}.to_json( request.{{ method.http_opt['body'] }}, - including_default_value_fields=False + including_default_value_fields=False, + use_integers_for_enums=False ) {%- else %} body = {{ method.input.ident }}.to_json( - request + request, + use_integers_for_enums=False ) {%- endif %} {%- endif %} From 4077b452a8e44b11488aeed7b40fb4f367d3c53f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 3 Feb 2021 11:01:58 -0800 Subject: [PATCH 11/11] chore: release 0.40.7 (#764) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index acd91750a9..39136258c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [0.40.7](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.6...v0.40.7) (2021-02-03) + + +### Bug Fixes + +* don't use integer for enums in json encoding ([#761](https://www.github.com/googleapis/gapic-generator-python/issues/761)) ([6d37a73](https://www.github.com/googleapis/gapic-generator-python/commit/6d37a7388995b90428ee6293bcce5d48cd9a48f8)) + ### [0.40.6](https://www.github.com/googleapis/gapic-generator-python/compare/v0.40.5...v0.40.6) (2021-02-02)