Skip to content

Commit f1db649

Browse files
committed
group related imports and use SourceModuleMoved
1 parent bc13d89 commit f1db649

1 file changed

Lines changed: 35 additions & 83 deletions

File tree

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

Lines changed: 35 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -120,121 +120,73 @@ fn check_name(checker: &Checker, expr: &Expr, range: TextRange) {
120120
"airflow",
121121
"utils",
122122
"setup_teardown",
123-
"BaseSetupTeardownContext",
124-
] => Replacement::Rename {
123+
rest @ ("BaseSetupTeardownContext" | "SetupTeardownContext"),
124+
] => Replacement::SourceModuleMoved {
125125
module: "airflow.sdk.definitions._internal.setup_teardown",
126-
name: "BaseSetupTeardownContext",
127-
},
128-
["airflow", "utils", "setup_teardown", "SetupTeardownContext"] => Replacement::Rename {
129-
module: "airflow.sdk.definitions._internal.setup_teardown",
130-
name: "SetupTeardownContext",
126+
name: rest.to_string(),
131127
},
132128
// airflow.utils.xcom
133-
["airflow", "utils", "xcom", "XCOM_RETURN_KEY"] => Replacement::Rename {
129+
["airflow", "utils", "xcom", "XCOM_RETURN_KEY"] => Replacement::SourceModuleMoved {
134130
module: "airflow.models.xcom",
135-
name: "XCOM_RETURN_KEY",
131+
name: "XCOM_RETURN_KEY".to_string(),
136132
},
137133
// airflow.utils.task_group
138-
["airflow", "utils", "task_group", "TaskGroup"] => Replacement::Rename {
134+
["airflow", "utils", "task_group", "TaskGroup"] => Replacement::SourceModuleMoved {
139135
module: "airflow.sdk",
140-
name: "TaskGroup",
136+
name: "TaskGroup".to_string(),
141137
},
142138
// airflow.utils.timezone
143-
["airflow", "utils", "timezone", "coerce_datetime"] => Replacement::Rename {
144-
module: "airflow.sdk.timezone",
145-
name: "coerce_datetime",
146-
},
147-
["airflow", "utils", "timezone", "convert_to_utc"] => Replacement::Rename {
148-
module: "airflow.sdk.timezone",
149-
name: "convert_to_utc",
150-
},
151-
["airflow", "utils", "timezone", "datetime"] => Replacement::Rename {
152-
module: "airflow.sdk.timezone",
153-
name: "datetime",
154-
},
155-
["airflow", "utils", "timezone", "make_naive"] => Replacement::Rename {
156-
module: "airflow.sdk.timezone",
157-
name: "make_naive",
158-
},
159-
["airflow", "utils", "timezone", "parse"] => Replacement::Rename {
160-
module: "airflow.sdk.timezone",
161-
name: "parse",
162-
},
163-
["airflow", "utils", "timezone", "utc"] => Replacement::Rename {
164-
module: "airflow.sdk.timezone",
165-
name: "utc",
166-
},
167-
["airflow", "utils", "timezone", "utcnow"] => Replacement::Rename {
139+
[
140+
"airflow",
141+
"utils",
142+
"timezone",
143+
rest @ ("coerce_datetime" | "convert_to_utc" | "datetime" | "make_naive" | "parse"
144+
| "utc" | "utcnow"),
145+
] => Replacement::SourceModuleMoved {
168146
module: "airflow.sdk.timezone",
169-
name: "utcnow",
147+
name: rest.to_string(),
170148
},
171149
// airflow.utils.decorators
172-
["airflow", "utils", "decorators", "remove_task_decorator"] => Replacement::Rename {
173-
module: "airflow.sdk.definitions._internal.decorators",
174-
name: "remove_task_decorator",
175-
},
176150
[
177151
"airflow",
178152
"utils",
179153
"decorators",
180-
"fixup_decorator_warning_stack",
181-
] => Replacement::Rename {
154+
rest @ ("remove_task_decorator" | "fixup_decorator_warning_stack"),
155+
] => Replacement::SourceModuleMoved {
182156
module: "airflow.sdk.definitions._internal.decorators",
183-
name: "fixup_decorator_warning_stack",
157+
name: rest.to_string(),
184158
},
185159
// airflow.models.abstractoperator
186-
["airflow", "models", "abstractoperator", "AbstractOperator"] => Replacement::Rename {
187-
module: "airflow.sdk.definitions._internal.abstractoperator",
188-
name: "AbstractOperator",
189-
},
190-
["airflow", "models", "abstractoperator", "NotMapped"] => Replacement::Rename {
191-
module: "airflow.sdk.definitions._internal.abstractoperator",
192-
name: "NotMapped",
193-
},
194160
[
195161
"airflow",
196162
"models",
197163
"abstractoperator",
198-
"TaskStateChangeCallback",
199-
] => Replacement::Rename {
164+
rest @ ("AbstractOperator" | "NotMapped" | "TaskStateChangeCallback"),
165+
] => Replacement::SourceModuleMoved {
200166
module: "airflow.sdk.definitions._internal.abstractoperator",
201-
name: "TaskStateChangeCallback",
167+
name: rest.to_string(),
202168
},
203169
// airflow.models.baseoperator
204-
["airflow", "models", "baseoperator", "BaseOperator"] => Replacement::Rename {
170+
["airflow", "models", "baseoperator", "BaseOperator"] => Replacement::SourceModuleMoved {
205171
module: "airflow.sdk.bases.operator",
206-
name: "BaseOperator",
172+
name: "BaseOperator".to_string(),
207173
},
208174
// airflow.macros
209-
["airflow", "macros", "ds_add"] => Replacement::Rename {
210-
module: "airflow.sdk.execution_time.macros",
211-
name: "ds_add",
212-
},
213-
["airflow", "macros", "ds_format"] => Replacement::Rename {
214-
module: "airflow.sdk.execution_time.macros",
215-
name: "ds_format",
216-
},
217-
["airflow", "macros", "datetime_diff_for_humans"] => Replacement::Rename {
218-
module: "airflow.sdk.execution_time.macros",
219-
name: "datetime_diff_for_humans",
220-
},
221-
["airflow", "macros", "ds_format_locale"] => Replacement::Rename {
175+
[
176+
"airflow",
177+
"macros",
178+
rest @ ("ds_add" | "ds_format" | "datetime_diff_for_humans" | "ds_format_locale"),
179+
] => Replacement::SourceModuleMoved {
222180
module: "airflow.sdk.execution_time.macros",
223-
name: "ds_format_locale",
181+
name: rest.to_string(),
224182
},
225183
// airflow.io
226-
["airflow", "io", "get_fs"] => Replacement::Rename {
227-
module: "airflow.sdk.io",
228-
name: "get_fs",
229-
},
230-
["airflow", "io", "has_fs"] => Replacement::Rename {
231-
module: "airflow.sdk.io",
232-
name: "has_fs",
233-
},
234-
["airflow", "io", "Properties"] => Replacement::Rename {
235-
module: "airflow.sdk.io",
236-
name: "Properties",
237-
},
184+
["airflow", "io", rest @ ("get_fs" | "has_fs" | "Properties")] => {
185+
Replacement::SourceModuleMoved {
186+
module: "airflow.sdk.io",
187+
name: rest.to_string(),
188+
}
189+
}
238190
_ => return,
239191
};
240192

0 commit comments

Comments
 (0)