diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 81e24f2e8a3b3..e5e0daafc50f8 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -413,6 +413,7 @@ repos: ^airflow-ctl.*\.py$| ^airflow-core/src/airflow/models/.*\.py$| ^airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py$| + ^airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_task_instances.py$| ^task_sdk.*\.py$ pass_filenames: true - id: update-supported-versions diff --git a/airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_task_instances.py b/airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_task_instances.py index f91ae7f285f17..d9f4e1f42424f 100644 --- a/airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_task_instances.py +++ b/airflow-core/tests/unit/api_fastapi/execution_api/versions/head/test_task_instances.py @@ -1144,7 +1144,7 @@ def test_ti_update_state_to_deferred(self, client, session, create_task_instance session.expire_all() - tis = session.query(TaskInstance).all() + tis = session.scalars(select(TaskInstance)).all() assert len(tis) == 1 assert tis[0].state == TaskInstanceState.DEFERRED @@ -1155,7 +1155,7 @@ def test_ti_update_state_to_deferred(self, client, session, create_task_instance } assert tis[0].trigger_timeout == timezone.make_aware(datetime(2024, 11, 23), timezone=timezone.utc) - t = session.query(Trigger).all() + t = session.scalars(select(Trigger)).all() assert len(t) == 1 assert t[0].created_date == instant assert t[0].classpath == "my-classpath" @@ -1192,14 +1192,14 @@ def test_ti_update_state_to_reschedule(self, client, session, create_task_instan session.expire_all() - tis = session.query(TaskInstance).all() + tis = session.scalars(select(TaskInstance)).all() assert len(tis) == 1 assert tis[0].state == TaskInstanceState.UP_FOR_RESCHEDULE assert tis[0].next_method is None assert tis[0].next_kwargs is None assert tis[0].duration == 129600 - trs = session.query(TaskReschedule).all() + trs = session.scalars(select(TaskReschedule)).all() assert len(trs) == 1 assert trs[0].task_instance.dag_id == "dag" assert trs[0].task_instance.task_id == "test_ti_update_state_to_reschedule" @@ -1273,11 +1273,11 @@ def test_ti_update_state_handle_retry(self, client, session, create_task_instanc assert ti.next_method is None assert ti.next_kwargs is None - tih = ( - session.query(TaskInstanceHistory) - .where(TaskInstanceHistory.task_id == ti.task_id, TaskInstanceHistory.run_id == ti.run_id) - .one() - ) + tih = session.scalars( + select(TaskInstanceHistory).where( + TaskInstanceHistory.task_id == ti.task_id, TaskInstanceHistory.run_id == ti.run_id + ) + ).one() assert tih.task_instance_id assert tih.task_instance_id != ti.id @@ -1680,7 +1680,7 @@ def test_ti_put_rtif_success(self, client, session, create_task_instance, payloa session.expire_all() - rtifs = session.query(RenderedTaskInstanceFields).all() + rtifs = session.scalars(select(RenderedTaskInstanceFields)).all() assert len(rtifs) == 1 assert rtifs[0].dag_id == "dag"