Merge branch 'master' into dev/deprecations

googleapis · May 12, 2021 · facccdd · facccdd
2 parents 0c60d18 + 7087af5
commit facccdd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### [0.46.2](https://www.github.com/googleapis/gapic-generator-python/compare/v0.46.1...v0.46.2) (2021-05-12)
+
+
+### Bug Fixes
+
+* fix incorrectly referenced exceptions, add missing port to tests ([#873](https://www.github.com/googleapis/gapic-generator-python/issues/873)) ([40078c4](https://www.github.com/googleapis/gapic-generator-python/commit/40078c46b21a0dfa489d4cd80ed7d95bb542f3c3)), closes [#872](https://www.github.com/googleapis/gapic-generator-python/issues/872)
+
 ### [0.46.1](https://www.github.com/googleapis/gapic-generator-python/compare/v0.46.0...v0.46.1) (2021-05-07)
 
 

diff --git a/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2 b/gapic/ads-templates/%namespace/%name/%version/%sub/services/%service/transports/base.py.j2
@@ -91,7 +91,7 @@ class {{ service.name }}Transport(metaclass=abc.ABCMeta):
                     {% if method.retry.backoff_multiplier %}multiplier={{ method.retry.backoff_multiplier }},{% endif %}
                     predicate=retries.if_exception_type(
                         {% for ex in method.retry.retryable_exceptions|sort(attribute='__name__') %}
-                        exceptions.{{ ex.__name__ }},
+                        core_exceptions.{{ ex.__name__ }},
                         {% endfor %}
                     ),
                     deadline={{ method.timeout }},

diff --git a/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2 b/gapic/templates/%namespace/%name_%version/%sub/services/%service/async_client.py.j2
@@ -253,7 +253,7 @@ class {{ service.async_client_name }}:
                 {% if method.retry.backoff_multiplier %}multiplier={{ method.retry.backoff_multiplier }},{% endif %}
                 predicate=retries.if_exception_type(
                     {% for ex in method.retry.retryable_exceptions|sort(attribute="__name__") %}
-                    exceptions.{{ ex.__name__ }},
+                    core_exceptions.{{ ex.__name__ }},
                     {% endfor %}
                 ),
                 deadline={{ method.timeout }},

diff --git a/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2 b/gapic/templates/tests/unit/gapic/%name_%version/%sub/test_%service.py.j2
@@ -1665,7 +1665,7 @@ def test_{{ service.name|snake_case }}_transport_create_channel_old_api_core(tra
 
         {% with host = (service.host|default('localhost', true)) %}
         create_channel.assert_called_with(
-            "{{ host }}",
+            "{{ host }}{% if ":" not in service.host %}:443{% endif %}",
             credentials=creds,
             credentials_file=None,
             quota_project_id="octopus",
@@ -1703,7 +1703,7 @@ def test_{{ service.name|snake_case }}_transport_create_channel_user_scopes(tran
         transport_class(quota_project_id="octopus", scopes=["1", "2"])
 
         create_channel.assert_called_with(
-            "{{ host }}",
+            "{{ host }}{% if ":" not in service.host %}:443{% endif %}",
             credentials=creds,
             credentials_file=None,
             quota_project_id="octopus",

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-click==7.1.2
+click==8.0.0
 google-api-core==1.26.3
 googleapis-common-protos==1.53.0
 jinja2==3.0.0