This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v2-8-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit d7d782d94e4a299e7d11181c669abcc35291974d Author: Josh Fell <[email protected]> AuthorDate: Wed Dec 13 04:14:43 2023 -0500 Update `retry` param typing in PubSubAsyncHook (#36198) The `google-cloud-pubsub` library was [recently released](https://pypi.org/project/google-cloud-pubsub/2.19.0/) with a bug fix to update the `retry` parameter when using the SubscriberAsyncClient to AsyncRetry from Retry. Main builds were failing Mypy checks for this reason. (cherry picked from commit 8fbacb8a5fb4168a335ad080a6b806fee3d85737) --- airflow/providers/google/cloud/hooks/pubsub.py | 5 +++-- airflow/providers/google/provider.yaml | 2 +- generated/provider_dependencies.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/airflow/providers/google/cloud/hooks/pubsub.py b/airflow/providers/google/cloud/hooks/pubsub.py index 0f6e5fcff8..25c0bc107c 100644 --- a/airflow/providers/google/cloud/hooks/pubsub.py +++ b/airflow/providers/google/cloud/hooks/pubsub.py @@ -49,6 +49,7 @@ from airflow.version import version if TYPE_CHECKING: from google.api_core.retry import Retry + from google.api_core.retry_async import AsyncRetry from google.cloud.pubsub_v1.types import ( DeadLetterPolicy, Duration, @@ -611,7 +612,7 @@ class PubSubAsyncHook(GoogleBaseAsyncHook): project_id: str, ack_ids: list[str] | None = None, messages: list[ReceivedMessage] | None = None, - retry: Retry | _MethodDefault = DEFAULT, + retry: AsyncRetry | _MethodDefault = DEFAULT, timeout: float | None = None, metadata: Sequence[tuple[str, str]] = (), ) -> None: @@ -665,7 +666,7 @@ class PubSubAsyncHook(GoogleBaseAsyncHook): max_messages: int, project_id: str = PROVIDE_PROJECT_ID, return_immediately: bool = False, - retry: Retry | _MethodDefault = DEFAULT, + retry: AsyncRetry | _MethodDefault = DEFAULT, timeout: float | None = None, metadata: Sequence[tuple[str, str]] = (), ) -> list[ReceivedMessage]: diff --git a/airflow/providers/google/provider.yaml b/airflow/providers/google/provider.yaml index 4a7f9262f1..6e965dc1d9 100644 --- a/airflow/providers/google/provider.yaml +++ b/airflow/providers/google/provider.yaml @@ -114,7 +114,7 @@ dependencies: - google-cloud-monitoring>=2.14.1 - google-cloud-orchestration-airflow>=1.10.0 - google-cloud-os-login>=2.9.1 - - google-cloud-pubsub>=2.15.0 + - google-cloud-pubsub>=2.19.0 - google-cloud-redis>=2.12.0 - google-cloud-secret-manager>=2.16.0 - google-cloud-spanner>=3.11.1 diff --git a/generated/provider_dependencies.json b/generated/provider_dependencies.json index 60ffee762d..07e6f81b4c 100644 --- a/generated/provider_dependencies.json +++ b/generated/provider_dependencies.json @@ -443,7 +443,7 @@ "google-cloud-monitoring>=2.14.1", "google-cloud-orchestration-airflow>=1.10.0", "google-cloud-os-login>=2.9.1", - "google-cloud-pubsub>=2.15.0", + "google-cloud-pubsub>=2.19.0", "google-cloud-redis>=2.12.0", "google-cloud-run>=0.9.0", "google-cloud-secret-manager>=2.16.0",
