This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 7606f821a34 Remove remaining session query usages (#62758)
7606f821a34 is described below
commit 7606f821a347c62da670c8c5278a1873d5b9b09a
Author: Kunal Bhattacharya <[email protected]>
AuthorDate: Tue Mar 10 22:21:10 2026 +0530
Remove remaining session query usages (#62758)
* Remove remaining session.query usages
* Remove remaining session.query usages
* Change as per review comment
* Minor comment update in compat.sdk
---
airflow-core/tests/unit/models/test_deadline.py | 2 +-
.../common/compat/src/airflow/providers/common/compat/sdk.py | 2 +-
providers/standard/tests/unit/standard/utils/test_skipmixin.py | 8 ++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/airflow-core/tests/unit/models/test_deadline.py
b/airflow-core/tests/unit/models/test_deadline.py
index 379998efbb8..f4f435291ce 100644
--- a/airflow-core/tests/unit/models/test_deadline.py
+++ b/airflow-core/tests/unit/models/test_deadline.py
@@ -166,7 +166,7 @@ class TestDeadline:
mock_session.execute.return_value.all.assert_called_once()
mock_session.delete.assert_called_once_with(mock_deadline)
else:
- mock_session.query.assert_not_called()
+ mock_session.execute.assert_not_called()
def test_repr_with_callback_kwargs(self, deadline_orm, dagrun):
repr_str = repr(deadline_orm)
diff --git a/providers/common/compat/src/airflow/providers/common/compat/sdk.py
b/providers/common/compat/src/airflow/providers/common/compat/sdk.py
index f64fc215cf3..93174df7b2a 100644
--- a/providers/common/compat/src/airflow/providers/common/compat/sdk.py
+++ b/providers/common/compat/src/airflow/providers/common/compat/sdk.py
@@ -326,7 +326,7 @@ if AIRFLOW_V_3_0_PLUS:
# Module map: module_name -> module_path(s)
# For entire modules that have been moved (e.g., timezone)
-# Usage: from airflow.providers.common.compat.lazy_compat import timezone
+# Usage: from airflow.providers.common.compat.sdk import timezone
_MODULE_MAP: dict[str, str | tuple[str, ...]] = {
"timezone": ("airflow.sdk.timezone", "airflow.utils.timezone"),
"io": ("airflow.sdk.io", "airflow.io"),
diff --git a/providers/standard/tests/unit/standard/utils/test_skipmixin.py
b/providers/standard/tests/unit/standard/utils/test_skipmixin.py
index 58e9b8e9a20..10b46f80a5e 100644
--- a/providers/standard/tests/unit/standard/utils/test_skipmixin.py
+++ b/providers/standard/tests/unit/standard/utils/test_skipmixin.py
@@ -26,7 +26,11 @@ from sqlalchemy import select
from airflow.models.taskinstance import TaskInstance as TI
from airflow.providers.common.compat.sdk import AirflowException, SkipMixin
from airflow.providers.standard.operators.empty import EmptyOperator
-from airflow.utils import timezone
+
+try:
+ from airflow.providers.common.compat.sdk import timezone
+except ImportError: # Fallback for Airflow < 3.1
+ from airflow.utils import timezone # type: ignore[attr-defined,no-redef]
from airflow.utils.state import State
from airflow.utils.types import DagRunType
@@ -104,7 +108,7 @@ class TestSkipMixin:
else:
session = Mock()
assert SkipMixin().skip(dag_run=None, execution_date=None,
tasks=[]) is None
- assert not session.query.called
+ assert not session.scalars.called
assert not session.commit.called
@pytest.mark.skipif(not AIRFLOW_V_3_0_PLUS, reason="Airflow 2 had a
different implementation")
