Skip to content

Update correct annotation for 3.3 version compat constant #65999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amoghrajesh merged 1 commit into from
Apr 28, 2026
Merged

Update correct annotation for 3.3 version compat constant #65999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions providers/google/src/airflow/providers/google/cloud/triggers/dataproc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
from airflow.providers.google.cloud.hooks.dataproc import DataprocAsyncHook, DataprocHook
from airflow.providers.google.cloud.utils.dataproc import DataprocOperationType
from airflow.providers.google.common.hooks.base_google import PROVIDE_PROJECT_ID
from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS, AIRFLOW_V_3_3_0_PLUS
from airflow.providers.google.version_compat import AIRFLOW_V_3_0_PLUS, AIRFLOW_V_3_3_PLUS
from airflow.triggers.base import BaseTrigger, TriggerEvent
from airflow.utils.state import TaskInstanceState

if TYPE_CHECKING:
from sqlalchemy.orm.session import Session

if not AIRFLOW_V_3_3_0_PLUS:
if not AIRFLOW_V_3_3_PLUS:
from sqlalchemy import select

from airflow.models.taskinstance import TaskInstance
Expand Down Expand Up @@ -132,7 +132,7 @@ async def on_kill(self) -> None:
)
self.log.info("Job: %s is cancelled.", self.job_id)

if not AIRFLOW_V_3_3_0_PLUS:
if not AIRFLOW_V_3_3_PLUS:

@provide_session
def get_task_instance(self, session: Session) -> TaskInstance:
Expand Down Expand Up @@ -212,7 +212,7 @@ async def run(self):
{"job_id": self.job_id, "job_state": JobStatus.State(state).name, "job": Job.to_dict(job)}
)
except asyncio.CancelledError:
if not AIRFLOW_V_3_3_0_PLUS:
if not AIRFLOW_V_3_3_PLUS:
self.log.info("Task got cancelled.")
try:
if self.job_id and self.cancel_on_kill and await self.safe_to_cancel():
Expand Down Expand Up @@ -284,7 +284,7 @@ async def on_kill(self) -> None:
)
self.log.info("Job: %s is cancelled.", self.job_id)

if not AIRFLOW_V_3_3_0_PLUS:
if not AIRFLOW_V_3_3_PLUS:

@provide_session
def get_task_instance(self, session: Session) -> TaskInstance:
Expand Down Expand Up @@ -371,7 +371,7 @@ async def run(self) -> AsyncIterator[TriggerEvent]:
{"job_id": self.job_id, "job_state": JobStatus.State(state).name, "job": Job.to_dict(job)}
)
except asyncio.CancelledError:
if not AIRFLOW_V_3_3_0_PLUS:
if not AIRFLOW_V_3_3_PLUS:
self.log.info("Task got cancelled.")
try:
if self.job_id and self.cancel_on_kill and await self.safe_to_cancel():
Expand Down
4 changes: 2 additions & 2 deletions providers/google/src/airflow/providers/google/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
AIRFLOW_V_3_1_PLUS = get_base_airflow_version_tuple() >= (3, 1, 0)
# BaseTrigger.on_kill() was introduced in 3.3.0; use this flag to guard trigger migrations
AIRFLOW_V_3_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 3, 0)
AIRFLOW_V_3_3_PLUS = get_base_airflow_version_tuple() >= (3, 3, 0)

# Version-compatible imports
# BaseOperator: Use 3.1+ due to xcom_push method missing in SDK BaseOperator 3.0.x
Expand All @@ -49,4 +49,4 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:


# Explicitly export these imports to protect them from being removed by linters
__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "AIRFLOW_V_3_3_0_PLUS", "BaseOperator"]
__all__ = ["AIRFLOW_V_3_0_PLUS", "AIRFLOW_V_3_1_PLUS", "AIRFLOW_V_3_3_PLUS", "BaseOperator"]
Loading