rename the rule, and some updates to rule

Author: sjyangkevin

crates/ruff_linter/src/checkers/ast/analyze/expression.rs

@@ -262,8 +262,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
                     if checker.is_rule_enabled(Rule::Airflow3Removal) {
                         airflow::rules::airflow_3_removal_expr(checker, expr);
                     }
-                    if checker.is_rule_enabled(Rule::Airflow31Removal) {
-                        airflow::rules::airflow_3_1_removal_expr(checker, expr);
+                    if checker.is_rule_enabled(Rule::Airflow31Moved) {
+                        airflow::rules::airflow_3_1_moved_expr(checker, expr);
                     }
                     if checker.is_rule_enabled(Rule::Airflow3SuggestedUpdate) {
                         airflow::rules::airflow_3_0_suggested_update_expr(checker, expr);
@@ -490,8 +490,8 @@ pub(crate) fn expression(expr: &Expr, checker: &Checker) {
             if checker.is_rule_enabled(Rule::Airflow3Removal) {
                 airflow::rules::airflow_3_removal_expr(checker, expr);
             }
-            if checker.is_rule_enabled(Rule::Airflow31Removal) {
-                airflow::rules::airflow_3_1_removal_expr(checker, expr);
+            if checker.is_rule_enabled(Rule::Airflow31Moved) {
+                airflow::rules::airflow_3_1_moved_expr(checker, expr);
             }
             if checker.is_rule_enabled(Rule::Airflow3SuggestedUpdate) {
                 airflow::rules::airflow_3_0_suggested_update_expr(checker, expr);

crates/ruff_linter/src/codes.rs

@@ -1128,7 +1128,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
         (Airflow, "303") => rules::airflow::rules::Airflow3IncompatibleFunctionSignature,
         (Airflow, "311") => rules::airflow::rules::Airflow3SuggestedUpdate,
         (Airflow, "312") => rules::airflow::rules::Airflow3SuggestedToMoveToProvider,
-        (Airflow, "321") => rules::airflow::rules::Airflow31Removal,
+        (Airflow, "321") => rules::airflow::rules::Airflow31Moved,
 
         // perflint
         (Perflint, "101") => rules::perflint::rules::UnnecessaryListCast,

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

@@ -23,7 +23,7 @@ mod tests {
     #[test_case(Rule::Airflow3Removal, Path::new("AIR301_class_attribute.py"))]
     #[test_case(Rule::Airflow3Removal, Path::new("AIR301_airflow_plugin.py"))]
     #[test_case(Rule::Airflow3Removal, Path::new("AIR301_context.py"))]
-    #[test_case(Rule::Airflow31Removal, Path::new("AIR321_names.py"))]
+    #[test_case(Rule::Airflow31Moved, Path::new("AIR321_names.py"))]
     #[test_case(Rule::Airflow3MovedToProvider, Path::new("AIR302_amazon.py"))]
     #[test_case(Rule::Airflow3MovedToProvider, Path::new("AIR302_celery.py"))]
     #[test_case(Rule::Airflow3MovedToProvider, Path::new("AIR302_common_sql.py"))]

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

@@ -1,17 +1,17 @@
 pub(crate) use dag_schedule_argument::*;
 pub(crate) use function_signature_change_in_3::*;
+pub(crate) use moved_in_3_1::*;
 pub(crate) use moved_to_provider_in_3::*;
 pub(crate) use removal_in_3::*;
-pub(crate) use removal_in_3_1::*;
 pub(crate) use suggested_to_move_to_provider_in_3::*;
 pub(crate) use suggested_to_update_3_0::*;
 pub(crate) use task_variable_name::*;
 
 mod dag_schedule_argument;
 mod function_signature_change_in_3;
+mod moved_in_3_1;
 mod moved_to_provider_in_3;
 mod removal_in_3;
-mod removal_in_3_1;
 mod suggested_to_move_to_provider_in_3;
 mod suggested_to_update_3_0;
 mod task_variable_name;

…rc/rules/airflow/rules/removal_in_3_1.rs …/src/rules/airflow/rules/moved_in_3_1.rscrates/ruff_linter/src/rules/airflow/rules/removal_in_3_1.rs renamed to crates/ruff_linter/src/rules/airflow/rules/moved_in_3_1.rs crates/ruff_linter/src/rules/airflow/rules/removal_in_3_1.rs renamed to crates/ruff_linter/src/rules/airflow/rules/moved_in_3_1.rs

@@ -34,22 +34,22 @@ use ruff_text_size::TextRange;
 /// ```
 #[derive(ViolationMetadata)]
 #[violation_metadata(preview_since = "NEXT_RUFF_VERSION")]
-pub(crate) struct Airflow31Removal {
+pub(crate) struct Airflow31Moved {
     deprecated: String,
     replacement: Replacement,
 }
 
-impl Violation for Airflow31Removal {
+impl Violation for Airflow31Moved {
     const FIX_AVAILABILITY: FixAvailability = FixAvailability::Sometimes;
 
     #[derive_message_formats]
     fn message(&self) -> String {
-        let Airflow31Removal { deprecated, .. } = self;
-        format!("`{deprecated}` is removed in Airflow 3.1")
+        let Airflow31Moved { deprecated, .. } = self;
+        format!("`{deprecated}` is moved in Airflow 3.1")
     }
 
     fn fix_title(&self) -> Option<String> {
-        let Airflow31Removal { replacement, .. } = self;
+        let Airflow31Moved { replacement, .. } = self;
         match replacement {
             Replacement::None => None,
             Replacement::AttrName(name) => Some(format!("Use `{name}` instead")),
@@ -80,7 +80,7 @@ impl Violation for Airflow31Removal {
 }
 
 /// AIR321
-pub(crate) fn airflow_3_1_removal_expr(checker: &Checker, expr: &Expr) {
+pub(crate) fn airflow_3_1_moved_expr(checker: &Checker, expr: &Expr) {
     if !checker.semantic().seen_module(Modules::AIRFLOW) {
         return;
     }
@@ -206,10 +206,11 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             "airflow",
             "macros",
             rest @ ("ds_add" | "ds_format" | "datetime_diff_for_humans" | "ds_format_locale"),
-        ] => Replacement::SourceModuleMovedToSDK {
+        ] => Replacement::SourceModuleMovedWithMessage {
             module: "airflow.sdk.execution_time.macros",
             name: rest.to_string(),
-            version: "1.1.0",
+            message: "With apache-airflow-task-sdk>=1.1.0,<=1.1.6. Please import from `airflow.sdk` for apache-airflow-task-sdk>1.1.6.",
+            suggest_fix: true,
         },
 
         // airflow.io
@@ -242,7 +243,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
         } if *suggest_fix => (module, name.as_str()),
         _ => {
             checker.report_diagnostic(
-                Airflow31Removal {
+                Airflow31Moved {
                     deprecated: qualified_name.to_string(),
                     replacement: replacement.clone(),
                 },
@@ -258,7 +259,7 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
 
     let import_target = name.split('.').next().unwrap_or(name);
     let mut diagnostic = checker.report_diagnostic(
-        Airflow31Removal {
+        Airflow31Moved {
             deprecated: qualified_name.to_string(),
             replacement: replacement.clone(),
         },

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

@@ -309,9 +309,10 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
             name: (*rest).to_string(),
         },
 
-        ["airflow", "sensors", "base", "poke_mode_only"] => Replacement::SourceModuleMoved {
+        ["airflow", "sensors", "base", "poke_mode_only"] => Replacement::SourceModuleMovedToSDK {
             module: "airflow.sdk.bases.sensor",
             name: "poke_mode_only".to_string(),
+            version: "1.0.0",
         },
 
         // airflow.timetables

crates/ruff_linter/src/rules/airflow/snapshots/ruff_linter__rules__airflow__tests__AIR311_AIR311_names.py.snap

@@ -908,7 +908,7 @@ AIR311 [*] `airflow.sensors.base.poke_mode_only` is removed in Airflow 3.0; It s
 119 | poke_mode_only()
     | ^^^^^^^^^^^^^^
     |
-help: Use `poke_mode_only` from `airflow.sdk.bases.sensor` instead.
+help: `poke_mode_only` has been moved to `airflow.sdk.bases.sensor` since Airflow 3.0 (with apache-airflow-task-sdk>=1.0.0).
 110 | from airflow.sensors.base import (
 111 |     BaseSensorOperator,
 112 |     PokeReturnValue,