[`airflow`] Expand module path check to individual symbols (`AIR302`) by Lee-W · Pull Request #17278 · astral-sh/ruff

Lee-W · 2025-04-07T15:01:32Z

Summary

Improvement

Expand the following moved module into individual symbols.

airflow.triggers.temporal
airflow.triggers.file
airflow.triggers.external_task
airflow.hooks.subprocess
airflow.hooks.package_index
airflow.hooks.filesystem
airflow.sensors.weekday
airflow.sensors.time_delta
airflow.sensors.time_sensor
airflow.sensors.date_time
airflow.operators.weekday
airflow.operators.datetime
airflow.operators.bash

This removes Replacement::ImportPathMoved.

Fix

During the expansion, the following paths were also fixed

airflow.sensors.s3_key_sensor.S3KeySensor → airflow.providers.amazon.aws.sensors.S3KeySensor
airflow.operators.sql.SQLThresholdCheckOperator → airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator
airflow.hooks.druid_hook.DruidDbApiHook → airflow.providers.apache.druid.hooks.druid.DruidDbApiHook
airflow.hooks.druid_hook.DruidHook → airflow.providers.apache.druid.hooks.druid.DruidHook
airflow.kubernetes.pod_generator.extend_object_field → airflow.providers.cncf.kubernetes.pod_generator.extend_object_field
airflow.kubernetes.pod_launcher.PodLauncher → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodLauncher
airflow.kubernetes.pod_launcher.PodStatus → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodStatus
airflow.kubernetes.pod_generator.PodDefaults → airflow.providers.cncf.kubernetes.pod_generator.PodDefaults
airflow.kubernetes.pod_launcher_deprecated.PodDefaults → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodDefaults

Refactor

As many symbols are moved into the same module, SourceModuleMovedToProvider is introduced for grouping similar logic

Test Plan

crates/ruff_linter/resources/test/fixtures/airflow/AIR302.py

github-actions · 2025-04-07T15:08:11Z

`ruff-ecosystem` results

Linter (stable)

✅ ecosystem check detected no linter changes.

Linter (preview)

ℹ️ ecosystem check detected linter changes. (+2 -2 violations, +0 -0 fixes in 1 projects; 54 projects unchanged)

apache/airflow (+2 -2 violations, +0 -0 fixes)

ruff check --no-cache --exit-zero --ignore RUF9 --no-fix --output-format concise --preview --select ALL

- performance/src/performance_dags/performance_dag/performance_dag.py:95:13: AIR302 Import path `airflow.operators.bash` is moved into `standard` provider in Airflow 3.0;
+ performance/src/performance_dags/performance_dag/performance_dag.py:95:13: AIR302 `airflow.operators.bash.BashOperator` is moved into `standard` provider in Airflow 3.0;
- providers/edge/src/airflow/providers/edge/example_dags/integration_test.py:116:24: AIR302 Import path `airflow.operators.bash` is moved into `standard` provider in Airflow 3.0;
+ providers/edge/src/airflow/providers/edge/example_dags/integration_test.py:116:24: AIR302 `airflow.operators.bash.BashOperator` is moved into `standard` provider in Airflow 3.0;

Changes by rule (1 rules affected)

code	total	+ violation	- violation	+ fix	- fix
AIR302	4	2	2	0	0

Lee-W · 2025-04-07T15:22:57Z

@ntBre Hey, it would be nice if we could get this one reviewed. 🙏 The amount of change is enormous, but I tried to split the PR into 20 separate commits, so I hope it will be easier to review that way

ntBre

Thanks! This was easy to review commit-by-commit. I had one suggestion, but I'm happy enough with the current version if you are.

crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs

* airflow.sensors.s3_key_sensor.S3KeySensor → airflow.providers.amazon.aws.sensors.S3KeySensor * airflow.operators.sql.SQLThresholdCheckOperator → airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator * airflow.hooks.druid_hook.DruidDbApiHook → airflow.providers.apache.druid.hooks.druid.DruidDbApiHook * airflow.hooks.druid_hook.DruidHook → airflow.providers.apache.druid.hooks.druid.DruidHook * airflow.kubernetes.pod_generator.extend_object_field → airflow.providers.cncf.kubernetes.pod_generator.extend_object_field * airflow.kubernetes.pod_launcher.PodLauncher → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodLauncher * airflow.kubernetes.pod_launcher.PodStatus → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodStatus * airflow.kubernetes.pod_generator.PodDefaults → airflow.providers.cncf.kubernetes.pod_generator.PodDefaults * airflow.kubernetes.pod_launcher_deprecated.PodDefaults → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodDefaults

…ider

* origin/main: [red-knot] Default `python-platform` to current platform (#17183) [red-knot] Add new 'unreachable code' test case (#17306) [red-knot] mypy_primer: Run on `async-utils` (#17303) [red-knot] Add custom `__setattr__` support (#16748) [red-knot] Add `__init__` arguments check when doing `try_call` on a class literal (#16512) [`flake8-pie`] Avoid false positive for multiple assignment with `auto()` (`PIE796`) (#17274) [syntax-errors] Async comprehension in sync comprehension (#17177) [`airflow`] Expand module path check to individual symbols (`AIR302`) (#17278) [syntax-errors] Check annotations in annotated assignments (#17283) [syntax-errors] Extend annotation checks to `await` (#17282) [red-knot] Add support for `assert_never` (#17287) [`flake8-pytest-style`] Avoid false positive for legacy form of `pytest.raises` (`PT011`) (#17231) [red-knot] Do not show types for literal expressions on hover (#17290) [red-knot] Fix dead-code clippy warning (#17291) [red-knot] Reachability analysis (#17199) [red-knot] Don't use latency-sensitive for handlers (#17227)

* dcreager/special-class: (26 commits) lint Add TODO about property test data Better todos Narrow type(generic) better More Python-like displays for specializations Add xfail for generic method inside generic class Comment other non-specializations Explain self_instance not being specialized Generic aliases are literals in type display Better TODO fallback type [red-knot] Default `python-platform` to current platform (#17183) [red-knot] Add new 'unreachable code' test case (#17306) [red-knot] mypy_primer: Run on `async-utils` (#17303) [red-knot] Add custom `__setattr__` support (#16748) [red-knot] Add `__init__` arguments check when doing `try_call` on a class literal (#16512) [`flake8-pie`] Avoid false positive for multiple assignment with `auto()` (`PIE796`) (#17274) [syntax-errors] Async comprehension in sync comprehension (#17177) [`airflow`] Expand module path check to individual symbols (`AIR302`) (#17278) [syntax-errors] Check annotations in annotated assignments (#17283) [syntax-errors] Extend annotation checks to `await` (#17282) ...

…astral-sh#17278) ## Summary ### Improvement Expand the following moved module into individual symbols. * airflow.triggers.temporal * airflow.triggers.file * airflow.triggers.external_task * airflow.hooks.subprocess * airflow.hooks.package_index * airflow.hooks.filesystem * airflow.sensors.weekday * airflow.sensors.time_delta * airflow.sensors.time_sensor * airflow.sensors.date_time * airflow.operators.weekday * airflow.operators.datetime * airflow.operators.bash This removes `Replacement::ImportPathMoved`. ## Fix During the expansion, the following paths were also fixed * airflow.sensors.s3_key_sensor.S3KeySensor → airflow.providers.amazon.aws.sensors.S3KeySensor * airflow.operators.sql.SQLThresholdCheckOperator → airflow.providers.common.sql.operators.sql.SQLThresholdCheckOperator * airflow.hooks.druid_hook.DruidDbApiHook → airflow.providers.apache.druid.hooks.druid.DruidDbApiHook * airflow.hooks.druid_hook.DruidHook → airflow.providers.apache.druid.hooks.druid.DruidHook * airflow.kubernetes.pod_generator.extend_object_field → airflow.providers.cncf.kubernetes.pod_generator.extend_object_field * airflow.kubernetes.pod_launcher.PodLauncher → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodLauncher * airflow.kubernetes.pod_launcher.PodStatus → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodStatus * airflow.kubernetes.pod_generator.PodDefaults → airflow.providers.cncf.kubernetes.pod_generator.PodDefaults * airflow.kubernetes.pod_launcher_deprecated.PodDefaults → airflow.providers.cncf.kubernetes.pod_launcher_deprecated.PodDefaults ### Refactor As many symbols are moved into the same module, `SourceModuleMovedToProvider` is introduced for grouping similar logic ## Test Plan

Skylion007 reviewed Apr 7, 2025

View reviewed changes

crates/ruff_linter/resources/test/fixtures/airflow/AIR302.py Outdated Show resolved Hide resolved

Lee-W marked this pull request as draft April 7, 2025 15:08

Lee-W force-pushed the get-rid-of-ImportPathMoved branch from dff2a88 to 08a8742 Compare April 7, 2025 15:10

Skylion007 mentioned this pull request Apr 7, 2025

Add pre-commit hook to check for merge conflicts #17279

Merged

Lee-W changed the title ~~Get rid of import path moved~~ [airflow] Expand module path check to individual symbols (AIR302) Apr 7, 2025

Lee-W marked this pull request as ready for review April 7, 2025 15:12

ntBre added rule Implementing or modifying a lint rule preview Related to preview mode features labels Apr 7, 2025

ntBre approved these changes Apr 7, 2025

View reviewed changes

crates/ruff_linter/src/rules/airflow/rules/moved_to_provider_in_3.rs Outdated Show resolved Hide resolved

Lee-W force-pushed the get-rid-of-ImportPathMoved branch from 6ba71da to b1d9dae Compare April 8, 2025 03:20

Lee-W mentioned this pull request Apr 8, 2025

[airflow] Add missing AIR302 attribute check #17115

Merged

Lee-W added 17 commits April 8, 2025 18:03

feat(AIR302): expand airflow.triggers.temporal ImportPathMoved

8ba03f0

feat(AIR302): expand airflow.triggers.file ImportPathMoved

fd0a370

feat(AIR302): expand airflow.triggers.external_task ImportPathMoved

9c85a7b

feat(AIR302): expand airflow.hooks.subprocess ImportPathMoved

5ada057

refactor(AIR302): combine multiple condition through ProviderNameMoved

c82ba84

feat(AIR302): expand airflow.hooks.package_index ImportPathMoved

59296cf

feat(AIR302): expand airflow.hooks.filesystem ImportPathMoved

ddba822

feat(AIR302): expand airflow.sensors.weekday ImportPathMoved

532520c

feat(AIR302): expand airflow.sensors.time_delta ImportPathMoved

73c6dd6

feat(AIR302): expand airflow.sensors.time_sensor ImportPathMoved

cd50102

feat(AIR302): expand airflow.sensors.date_time ImportPathMoved

be7acac

feat(AIR302): expand airflow.operators.weekday ImportPathMoved

9607c03

feat(AIR302): expand airflow.operators.datetime ImportPathMoved

e959596

feat(AIR302): expand airflow.operators.bash ImportPathMoved

c1df3a7

feat(AIR302): expand fab provider ImportPathMoved and get rid of it

3a45d7f

refactor(AIR302): group match condition based on providers

1edcc47

Lee-W added 5 commits April 8, 2025 18:03

test(AIR302): reorganize test cases

b7697cb

refactor(AIR302): rename ProviderNameMoved as SourceModuleMovedToProv…

4bf270b

…ider

style(AIR302): apply clippy suggestion

a9996d1

refactor(AIR302): simplify SourceModuleMovedToProvider match clause

d77e9a7

style: unify space style

2b039f0

Lee-W force-pushed the get-rid-of-ImportPathMoved branch from b1d9dae to 2b039f0 Compare April 8, 2025 10:03

ntBre approved these changes Apr 8, 2025

View reviewed changes

ntBre changed the title ~~[airflow] Expand module path check to individual symbols (AIR302)~~ [airflow] Expand module path check to individual symbols (AIR302) Apr 8, 2025

ntBre merged commit dc02732 into astral-sh:main Apr 8, 2025
22 checks passed

BrewTestBot mentioned this pull request Apr 10, 2025

ruff 0.11.5 Homebrew/homebrew-core#219299

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

[`airflow`] Expand module path check to individual symbols (`AIR302`)#17278

[`airflow`] Expand module path check to individual symbols (`AIR302`)#17278
ntBre merged 22 commits intoastral-sh:mainfrom
astronomer:get-rid-of-ImportPathMoved

Lee-W commented Apr 7, 2025 •

edited

Loading

Uh oh!

Uh oh!

github-actions bot commented Apr 7, 2025 •

edited

Loading

Uh oh!

Lee-W commented Apr 7, 2025

Uh oh!

ntBre left a comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

Lee-W commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Improvement

Fix

Refactor

Test Plan

Uh oh!

Uh oh!

github-actions bot commented Apr 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ruff-ecosystem results

Linter (stable)

Linter (preview)

Uh oh!

Lee-W commented Apr 7, 2025

Uh oh!

ntBre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Lee-W commented Apr 7, 2025 •

edited

Loading

github-actions bot commented Apr 7, 2025 •

edited

Loading

`ruff-ecosystem` results