Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support extend-select in pyproject.toml (#327)

This commit is contained in:
Anders Kaseorg 2022-10-04 14:24:30 -07:00 committed by GitHub
parent 44897b2a5b
commit f80d5e70dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pyproject.rs
View File

@ -33,6 +33,8 @@ pub struct Config {
pub extend_exclude: Vec<String>, pub extend_exclude: Vec<String>,
pub select: Option<Vec<CheckCode>>, pub select: Option<Vec<CheckCode>>,
#[serde(default)] #[serde(default)]
pub extend_select: Vec<CheckCode>,
#[serde(default)]
pub ignore: Vec<CheckCode>, pub ignore: Vec<CheckCode>,
#[serde(default)] #[serde(default)]
pub per_file_ignores: Vec<StrCheckCodePair>, pub per_file_ignores: Vec<StrCheckCodePair>,
@ -180,6 +182,7 @@ mod tests {
exclude: None, exclude: None,
extend_exclude: vec![], extend_exclude: vec![],
select: None, select: None,
extend_select: vec![],
ignore: vec![], ignore: vec![],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,
@ -202,6 +205,7 @@ line-length = 79
exclude: None, exclude: None,
extend_exclude: vec![], extend_exclude: vec![],
select: None, select: None,
extend_select: vec![],
ignore: vec![], ignore: vec![],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,
@ -224,6 +228,7 @@ exclude = ["foo.py"]
exclude: Some(vec!["foo.py".to_string()]), exclude: Some(vec!["foo.py".to_string()]),
extend_exclude: vec![], extend_exclude: vec![],
select: None, select: None,
extend_select: vec![],
ignore: vec![], ignore: vec![],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,
@ -246,6 +251,7 @@ select = ["E501"]
exclude: None, exclude: None,
extend_exclude: vec![], extend_exclude: vec![],
select: Some(vec![CheckCode::E501]), select: Some(vec![CheckCode::E501]),
extend_select: vec![],
ignore: vec![], ignore: vec![],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,
@ -257,6 +263,7 @@ select = ["E501"]
r#" r#"
[tool.black] [tool.black]
[tool.ruff] [tool.ruff]
extend-select = ["M001"]
ignore = ["E501"] ignore = ["E501"]
"#, "#,
)?; )?;
@ -268,6 +275,7 @@ ignore = ["E501"]
exclude: None, exclude: None,
extend_exclude: vec![], extend_exclude: vec![],
select: None, select: None,
extend_select: vec![CheckCode::M001],
ignore: vec![CheckCode::E501], ignore: vec![CheckCode::E501],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,
@ -334,6 +342,7 @@ other-attribute = 1
"directory/also_excluded.py".to_string(), "directory/also_excluded.py".to_string(),
], ],
select: None, select: None,
extend_select: vec![],
ignore: vec![], ignore: vec![],
per_file_ignores: vec![], per_file_ignores: vec![],
dummy_variable_rgx: None, dummy_variable_rgx: None,

1
src/settings.rs
View File

@ -170,6 +170,7 @@ impl Settings {
pyproject, pyproject,
project_root, project_root,
}; };
settings.select(config.extend_select);
settings.ignore(&config.ignore); settings.ignore(&config.ignore);
Ok(settings) Ok(settings)
} }