Skip to content

Commit b8b980c

Browse files
fixed static check
1 parent 9c8c3c8 commit b8b980c

File tree

6 files changed

+78
-12
lines changed

6 files changed

+78
-12
lines changed

airflow-core/src/airflow/jobs/scheduler_job_runner.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,9 +1239,7 @@ def process_executor_events(
12391239
# Safely extract bundle info: prefer dag_version when available,
12401240
# fall back to dag_model/dag_run for legacy tasks migrated from
12411241
# Airflow 2 where dag_version may be None (AIP-66).
1242-
_bundle_name = (
1243-
ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
1244-
)
1242+
_bundle_name = ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
12451243
_bundle_version = (
12461244
ti.dag_version.bundle_version if ti.dag_version else ti.dag_run.bundle_version
12471245
)
@@ -2983,9 +2981,7 @@ def _purge_task_instances_without_heartbeats(
29832981
)
29842982
# Safely extract bundle info with fallback for legacy tasks
29852983
# (dag_version may be None after Airflow 2 → 3 migration).
2986-
_hb_bundle_name = (
2987-
ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
2988-
)
2984+
_hb_bundle_name = ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
29892985
_hb_bundle_version = (
29902986
ti.dag_version.bundle_version if ti.dag_version else ti.dag_run.bundle_version
29912987
)

airflow-core/tests/unit/jobs/test_scheduler_job.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2836,7 +2836,6 @@ def test_purge_without_heartbeat_skips_when_missing_dag_version(self, dag_maker,
28362836
assert any("Backfilled dag_version_id" in rec.message for rec in caplog.records)
28372837
mock_executor.send_callback.assert_called_once()
28382838

2839-
28402839
@staticmethod
28412840
def mock_failure_callback(context):
28422841
pass
@@ -9053,7 +9052,7 @@ class TestSchedulerCallbackBundleInfoDagVersionNullable:
90539052
# ── With dag_version present ──────────────────────────────────────────
90549053

90559054
@pytest.mark.parametrize(
9056-
"dv_bundle_name, dv_bundle_version",
9055+
("dv_bundle_name", "dv_bundle_version"),
90579056
[
90589057
pytest.param("my-bundle", "v2.0", id="normal"),
90599058
pytest.param("dags-folder", None, id="version_none"),
@@ -9071,7 +9070,7 @@ def test_bundle_info_from_dag_version_when_present(self, dv_bundle_name, dv_bund
90719070
# ── With dag_version None (legacy Airflow 2 task) ─────────────────────
90729071

90739072
@pytest.mark.parametrize(
9074-
"model_bundle_name, run_bundle_version",
9073+
("model_bundle_name", "run_bundle_version"),
90759074
[
90769075
pytest.param("fallback-bundle", "v1.0-fallback", id="normal_fallback"),
90779076
pytest.param("dags-folder", None, id="version_none_fallback"),
@@ -9103,9 +9102,7 @@ def test_no_attribute_error_regardless_of_dag_version(self, dag_version_present)
91039102
The old code crashed with AttributeError when ti.dag_version was None.
91049103
The new fallback must never raise regardless of dag_version state.
91059104
"""
9106-
ti = _make_ti_with_dag_version(
9107-
dag_version=_make_dag_version() if dag_version_present else None
9108-
)
9105+
ti = _make_ti_with_dag_version(dag_version=_make_dag_version() if dag_version_present else None)
91099106

91109107
name = _extract_bundle_name(ti)
91119108
version = _extract_bundle_version(ti)

ruff_lint.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
PT006 Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
2+
--> airflow-core\tests\unit\jobs\test_scheduler_job.py:9055:9
3+
|
4+
9054 | @pytest.mark.parametrize(
5+
9055 | "dv_bundle_name, dv_bundle_version",
6+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7+
9056 | [
8+
9057 | pytest.param("my-bundle", "v2.0", id="normal"),
9+
|
10+
help: Use a `tuple` for the first argument
11+
12+
PT006 Wrong type passed to first argument of `pytest.mark.parametrize`; expected `tuple`
13+
--> airflow-core\tests\unit\jobs\test_scheduler_job.py:9073:9
14+
|
15+
9072 | @pytest.mark.parametrize(
16+
9073 | "model_bundle_name, run_bundle_version",
17+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
18+
9074 | [
19+
9075 | pytest.param("fallback-bundle", "v1.0-fallback", id="normal_fallback"),
20+
|
21+
help: Use a `tuple` for the first argument
22+
23+
Found 2 errors.
24+
No fixes available (2 hidden fixes can be enabled with the `--unsafe-fixes` option).

ruff_output.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
--- airflow-core\tests\unit\jobs\test_scheduler_job.py
2+
1 file would be reformatted
3+
+++ airflow-core\tests\unit\jobs\test_scheduler_job.py
4+
@@ -2836,7 +2836,6 @@
5+
assert any("Backfilled dag_version_id" in rec.message for rec in caplog.records)
6+
mock_executor.send_callback.assert_called_once()
7+
8+
-
9+
@staticmethod
10+
def mock_failure_callback(context):
11+
pass
12+
@@ -9103,9 +9102,7 @@
13+
The old code crashed with AttributeError when ti.dag_version was None.
14+
The new fallback must never raise regardless of dag_version state.
15+
"""
16+
- ti = _make_ti_with_dag_version(
17+
- dag_version=_make_dag_version() if dag_version_present else None
18+
- )
19+
+ ti = _make_ti_with_dag_version(dag_version=_make_dag_version() if dag_version_present else None)
20+
21+
name = _extract_bundle_name(ti)
22+
version = _extract_bundle_version(ti)
23+

ruff_output2.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--- airflow-core\src\airflow\jobs\scheduler_job_runner.py
2+
1 file would be reformatted
3+
+++ airflow-core\src\airflow\jobs\scheduler_job_runner.py
4+
@@ -1239,9 +1239,7 @@
5+
# Safely extract bundle info: prefer dag_version when available,
6+
# fall back to dag_model/dag_run for legacy tasks migrated from
7+
# Airflow 2 where dag_version may be None (AIP-66).
8+
- _bundle_name = (
9+
- ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
10+
- )
11+
+ _bundle_name = ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
12+
_bundle_version = (
13+
ti.dag_version.bundle_version if ti.dag_version else ti.dag_run.bundle_version
14+
)
15+
@@ -2983,9 +2981,7 @@
16+
)
17+
# Safely extract bundle info with fallback for legacy tasks
18+
# (dag_version may be None after Airflow 2 → 3 migration).
19+
- _hb_bundle_name = (
20+
- ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
21+
- )
22+
+ _hb_bundle_name = ti.dag_version.bundle_name if ti.dag_version else ti.dag_model.bundle_name
23+
_hb_bundle_version = (
24+
ti.dag_version.bundle_version if ti.dag_version else ti.dag_run.bundle_version
25+
)
26+

test_diff.txt

16.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)