mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-30 22:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Omit non-.py[i] files from module naming rules (#3153)

Browse source
This commit is contained in:
Charlie Marsh 2023-02-22 19:38:46 -05:00 • committed by GitHub
parent 049e77b939
commit 21d02cd51f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

0
crates/ruff/resources/test/fixtures/pep8_naming/N999/module/valid_name/file-with-dashes vendored Normal file
View file

1
crates/ruff/src/rules/pep8_naming/mod.rs
View file

@ -43,6 +43,7 @@ mod tests {
#[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__main__.py"); "N999_10")] #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__main__.py"); "N999_10")]
#[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/0001_initial.py"); "N999_11")] #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/0001_initial.py"); "N999_11")]
#[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__setup__.py"); "N999_12")] #[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/__setup__.py"); "N999_12")]
#[test_case(Rule::InvalidModuleName, Path::new("N999/module/valid_name/file-with-dashes"); "N999_13")]
fn rules(rule_code: Rule, path: &Path) -> Result<()> { fn rules(rule_code: Rule, path: &Path) -> Result<()> {
let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy()); let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
let diagnostics = test_path( let diagnostics = test_path(

7
crates/ruff/src/rules/pep8_naming/rules/invalid_module_name.rs
View file

@ -43,6 +43,13 @@ impl Violation for InvalidModuleName {
/// N999 /// N999
pub fn invalid_module_name(path: &Path, package: Option<&Path>) -> Option<Diagnostic> { pub fn invalid_module_name(path: &Path, package: Option<&Path>) -> Option<Diagnostic> {
if !path
.extension()
.map_or(false, |ext| ext == "py" || ext == "pyi")
{
return None;
}
if let Some(package) = package { if let Some(package) = package {
let module_name = if path.file_name().map_or(false, |file_name| { let module_name = if path.file_name().map_or(false, |file_name| {
file_name == "__init__.py" file_name == "__init__.py"

6
crates/ruff/src/rules/pep8_naming/snapshots/ruff__rules__pep8_naming__tests__N999_N999__module__valid_name__file-with-dashes.snap Normal file
View file

@ -0,0 +1,6 @@
---
source: crates/ruff/src/rules/pep8_naming/mod.rs
expression: diagnostics
---
[]