Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,8 @@ linter.flake8_self.ignore_names = [
linter.flake8_tidy_imports.ban_relative_imports = "parents"
linter.flake8_tidy_imports.banned_api = {}
linter.flake8_tidy_imports.banned_module_level_imports = []
linter.flake8_tidy_imports.banned_eager_imports = []
linter.flake8_tidy_imports.require_lazy = []
linter.flake8_tidy_imports.ban_lazy = []
linter.flake8_type_checking.strict = false
linter.flake8_type_checking.exempt_modules = [
typing,
Expand Down
8 changes: 4 additions & 4 deletions crates/ruff_linter/src/checkers/ast/analyze/statement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -582,8 +582,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
if checker.is_rule_enabled(Rule::BannedModuleLevelImports) {
flake8_tidy_imports::rules::banned_module_level_imports(checker, stmt);
}
if checker.is_rule_enabled(Rule::BannedEagerImports) {
flake8_tidy_imports::rules::banned_eager_imports(checker, stmt);
if checker.is_rule_enabled(Rule::LazyImportMismatch) {
flake8_tidy_imports::rules::lazy_import_mismatch(checker, stmt);
}

for alias in names {
Expand Down Expand Up @@ -789,8 +789,8 @@ pub(crate) fn statement(stmt: &Stmt, checker: &mut Checker) {
if checker.is_rule_enabled(Rule::BannedModuleLevelImports) {
flake8_tidy_imports::rules::banned_module_level_imports(checker, stmt);
}
if checker.is_rule_enabled(Rule::BannedEagerImports) {
flake8_tidy_imports::rules::banned_eager_imports(checker, stmt);
if checker.is_rule_enabled(Rule::LazyImportMismatch) {
flake8_tidy_imports::rules::lazy_import_mismatch(checker, stmt);
}

if checker.is_rule_enabled(Rule::PytestIncorrectPytestImport) {
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/codes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ pub fn code_to_rule(linter: Linter, code: &str) -> Option<(RuleGroup, Rule)> {
(Flake8TidyImports, "251") => rules::flake8_tidy_imports::rules::BannedApi,
(Flake8TidyImports, "252") => rules::flake8_tidy_imports::rules::RelativeImports,
(Flake8TidyImports, "253") => rules::flake8_tidy_imports::rules::BannedModuleLevelImports,
(Flake8TidyImports, "254") => rules::flake8_tidy_imports::rules::BannedEagerImports,
(Flake8TidyImports, "254") => rules::flake8_tidy_imports::rules::LazyImportMismatch,

// flake8-return
(Flake8Return, "501") => rules::flake8_return::rules::UnnecessaryReturnNone,
Expand Down
122 changes: 105 additions & 17 deletions crates/ruff_linter/src/rules/flake8_tidy_imports/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mod tests {
use crate::registry::Rule;
use crate::rules::flake8_tidy_imports;
use crate::rules::flake8_tidy_imports::settings::{
AllImports, ApiBan, BannedEagerImports, Strictness,
AllImports, ApiBan, ImportSelection, ImportSelector, ImportSelectorSettings, Strictness,
};
use crate::settings::LinterSettings;
use crate::source_kind::SourceKind;
Expand Down Expand Up @@ -150,23 +150,23 @@ mod tests {
}

#[test]
fn preview_banned_eager_imports() -> Result<()> {
fn preview_lazy_import_mismatch() -> Result<()> {
let diagnostics = test_path(
Path::new("flake8_tidy_imports/TID254.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
banned_eager_imports: BannedEagerImports::Imports(vec![
require_lazy: ImportSelector::Selection(ImportSelection::Imports(vec![
"typing".to_string(),
"foo".to_string(),
"email".to_string(),
"bar".to_string(),
"starry".to_string(),
"collections".to_string(),
"pkg".to_string(),
]),
])),
..Default::default()
},
..LinterSettings::for_rule(Rule::BannedEagerImports)
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
Expand All @@ -176,15 +176,15 @@ mod tests {
}

#[test]
fn preview_banned_eager_imports_all() -> Result<()> {
fn preview_lazy_import_mismatch_all() -> Result<()> {
let diagnostics = test_path(
Path::new("flake8_tidy_imports/TID254.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
banned_eager_imports: BannedEagerImports::All(AllImports::All),
require_lazy: ImportSelector::Selection(ImportSelection::All(AllImports::All)),
..Default::default()
},
..LinterSettings::for_rule(Rule::BannedEagerImports)
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
Expand All @@ -194,15 +194,15 @@ mod tests {
}

#[test]
fn preview_banned_eager_imports_pre_py315() -> Result<()> {
fn preview_lazy_import_mismatch_pre_py315() -> Result<()> {
let diagnostics = test_path(
Path::new("flake8_tidy_imports/TID254_py314.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
banned_eager_imports: BannedEagerImports::All(AllImports::All),
require_lazy: ImportSelector::Selection(ImportSelection::All(AllImports::All)),
..Default::default()
},
..LinterSettings::for_rule(Rule::BannedEagerImports)
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY314)
},
Expand All @@ -212,7 +212,7 @@ mod tests {
}

#[test]
fn preview_banned_eager_imports_fix() {
fn preview_lazy_import_mismatch_fix() {
let source = dedent(
r#"
from __future__ import annotations
Expand Down Expand Up @@ -276,10 +276,10 @@ mod tests {
Path::new("flake8_tidy_imports/TID254_fix.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
banned_eager_imports: BannedEagerImports::All(AllImports::All),
require_lazy: ImportSelector::Selection(ImportSelection::All(AllImports::All)),
..Default::default()
},
..LinterSettings::for_rule(Rule::BannedEagerImports)
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
Expand All @@ -290,7 +290,7 @@ mod tests {
}

#[test]
fn preview_banned_eager_imports_dotted_module() {
fn preview_lazy_import_mismatch_dotted_module() {
let source = dedent(
r#"
import foo
Expand Down Expand Up @@ -320,10 +320,98 @@ mod tests {
Path::new("flake8_tidy_imports/TID254_dotted.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
banned_eager_imports: BannedEagerImports::Imports(vec!["foo.bar".to_string()]),
require_lazy: ImportSelector::Selection(ImportSelection::Imports(vec![
"foo.bar".to_string(),
])),
..Default::default()
},
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
);

assert_eq!(diagnostics.len(), 2);
assert_eq!(fixed.source_code(), expected);
}

#[test]
fn preview_lazy_import_mismatch_exclude() {
let source = dedent(
r#"
import sitecustomize
import typing
import typing_extensions
"#,
);
let expected = dedent(
r#"
import sitecustomize
lazy import typing
lazy import typing_extensions
"#,
);

let source_kind = SourceKind::Python {
code: source.to_string(),
is_stub: false,
};

let (diagnostics, fixed) = test_contents(
&source_kind,
Path::new("flake8_tidy_imports/TID254_exclude.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
require_lazy: ImportSelector::Settings(ImportSelectorSettings {
include: ImportSelection::All(AllImports::All),
exclude: vec!["sitecustomize".to_string()],
}),
..Default::default()
},
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
);

assert_eq!(diagnostics.len(), 2);
assert_eq!(fixed.source_code(), expected);
}

#[test]
fn preview_lazy_import_mismatch_ban_lazy() {
let source = dedent(
r#"
lazy import sitecustomize
lazy import typing
lazy from foo import bar
"#,
);
let expected = dedent(
r#"
lazy import sitecustomize
import typing
from foo import bar
"#,
);

let source_kind = SourceKind::Python {
code: source.to_string(),
is_stub: false,
};

let (diagnostics, fixed) = test_contents(
&source_kind,
Path::new("flake8_tidy_imports/TID254_ban_lazy.py"),
&LinterSettings {
flake8_tidy_imports: flake8_tidy_imports::settings::Settings {
ban_lazy: ImportSelector::Settings(ImportSelectorSettings {
include: ImportSelection::All(AllImports::All),
exclude: vec!["sitecustomize".to_string()],
}),
..Default::default()
},
..LinterSettings::for_rule(Rule::BannedEagerImports)
..LinterSettings::for_rule(Rule::LazyImportMismatch)
.with_preview_mode()
.with_target_version(PythonVersion::PY315)
},
Expand Down
Loading