Skip to content

Commit 3728494

Browse files
authored
Fix last google provider MyPy errors (#21010)
Part of #19891
1 parent 73c0d24 commit 3728494

File tree

5 files changed

+10
-50
lines changed

5 files changed

+10
-50
lines changed

β€Žairflow/providers/google/cloud/operators/gcs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -746,10 +746,10 @@ def execute(self, context: "Context") -> List[str]:
746746

747747
if timespan_end is None: # Only possible in Airflow before 2.2.
748748
self.log.warning("No following schedule found, setting timespan end to max %s", timespan_end)
749-
timespan_end = DateTime.max
749+
timespan_end = timezone.coerce_datetime(DateTime.max)
750750
elif timespan_start >= timespan_end: # Airflow 2.2 sets start == end for non-perodic schedules.
751751
self.log.warning("DAG schedule not periodic, setting timespan end to max %s", timespan_end)
752-
timespan_end = DateTime.max
752+
timespan_end = timezone.coerce_datetime(DateTime.max)
753753

754754
timespan_start = timespan_start.in_timezone(timezone.utc)
755755
timespan_end = timespan_end.in_timezone(timezone.utc)

β€Žairflow/providers/google/cloud/operators/pubsub.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@ def __init__(
830830
subscription: str,
831831
max_messages: int = 5,
832832
ack_messages: bool = False,
833-
messages_callback: Optional[Callable[[List[ReceivedMessage], Dict[str, Any]], Any]] = None,
833+
messages_callback: Optional[Callable[[List[ReceivedMessage], "Context"], Any]] = None,
834834
gcp_conn_id: str = 'google_cloud_default',
835835
delegate_to: Optional[str] = None,
836836
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
@@ -876,7 +876,7 @@ def execute(self, context: 'Context') -> list:
876876
def _default_message_callback(
877877
self,
878878
pulled_messages: List[ReceivedMessage],
879-
context: Dict[str, Any],
879+
context: "Context",
880880
) -> list:
881881
"""
882882
This method can be overridden by subclasses or by `messages_callback` constructor argument.

β€Žairflow/providers/google/cloud/sensors/pubsub.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
"""This module contains a Google PubSub sensor."""
1919
import warnings
20-
from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Sequence, Union
20+
from typing import TYPE_CHECKING, Any, Callable, List, Optional, Sequence, Union
2121

2222
from google.cloud.pubsub_v1.types import ReceivedMessage
2323

@@ -104,7 +104,7 @@ def __init__(
104104
return_immediately: bool = True,
105105
ack_messages: bool = False,
106106
gcp_conn_id: str = 'google_cloud_default',
107-
messages_callback: Optional[Callable[[List[ReceivedMessage], Dict[str, Any]], Any]] = None,
107+
messages_callback: Optional[Callable[[List[ReceivedMessage], "Context"], Any]] = None,
108108
delegate_to: Optional[str] = None,
109109
project: Optional[str] = None,
110110
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,

β€Žairflow/providers/google/cloud/transfers/gcs_to_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def __init__(
8989
google_cloud_storage_conn_id: Optional[str] = None,
9090
delegate_to: Optional[str] = None,
9191
impersonation_chain: Optional[Union[str, Sequence[str]]] = None,
92-
file_encoding: Optional[str] = 'utf-8',
92+
file_encoding: str = 'utf-8',
9393
**kwargs,
9494
) -> None:
9595
# To preserve backward compatibility

β€Žsetup.cfg

Lines changed: 3 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -180,49 +180,9 @@ show_error_codes = True
180180
[mypy-airflow.migrations.*]
181181
ignore_errors = True
182182

183-
[mypy-google.cloud.tasks_v2.*]
184-
no_implicit_optional = False
185-
186-
[mypy-google.cloud.automl_v1beta1.services.auto_ml.*]
187-
no_implicit_optional = False
188-
189-
[mypy-google.cloud.metastore_v1.services.dataproc_metastore.*]
190-
no_implicit_optional = False
191-
192-
[mypy-google.cloud.dataproc_v1.services.workflow_template_service.*]
193-
no_implicit_optional = False
194-
195-
[mypy-google.cloud.dataproc_v1.services.job_controller.*]
196-
no_implicit_optional = False
197-
198-
[mypy-google.cloud.dataproc_v1.services.batch_controller.*]
199-
no_implicit_optional = False
200-
201-
[mypy-google.cloud.dataproc_v1.services.cluster_controller.*]
202-
no_implicit_optional = False
203-
204-
[mypy-google.cloud.bigquery_datatransfer_v1.services.data_transfer_service.*]
205-
no_implicit_optional = False
206-
207-
[mypy-google.cloud.devtools.cloudbuild_v1.services.cloud_build.*]
208-
no_implicit_optional = False
209-
210-
[mypy-google.cloud.workflows_v1beta.services.workflows.*]
211-
no_implicit_optional = False
212-
213-
[mypy-google.cloud.workflows.executions_v1beta.services.executions.*]
214-
no_implicit_optional = False
215-
216-
[mypy-google.cloud.datacatalog_v1.services.data_catalog.*]
217-
no_implicit_optional = False
218-
219-
[mypy-google.cloud.redis_v1.services.cloud_redis.*]
220-
no_implicit_optional = False
221-
222-
[mypy-google.cloud.kms_v1.services.key_management_service.*]
223-
no_implicit_optional = False
224-
225-
[mypy-google.cloud.oslogin_v1.services.os_login_service.*]
183+
# Let's assume all google.cloud packages have no implicit optional
184+
# Most of them don't but even if they do, it does not matter
185+
[mypy-google.cloud.*]
226186
no_implicit_optional = False
227187

228188
[isort]

0 commit comments

Comments
 (0)