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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Update correct annotation for 3.3 version compat constant by amoghrajesh · Pull Request #65999 · apache/airflow · GitHub
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 numberDiff line numberDiff 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 DownExpand 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 DownExpand 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 DownExpand 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 DownExpand 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 numberDiff line numberDiff 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