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

Avoid parsing pyproject.toml files when settings are fixed (#1827) 

Apart from being wasteful, this can also cause problems (see the linked
issue).

Resolves #1812.
This commit is contained in:
Charlie Marsh 2023-01-12 13:15:44 -05:00 committed by GitHub
parent 38f5e8f423
commit dcccfe2591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/test/project/README.md
View File

@ -17,7 +17,7 @@ resources/test/project/examples/docs/docs/file.py:8:5: F841 Local variable `x` i
resources/test/project/project/file.py:1:8: F401 `os` imported but unused resources/test/project/project/file.py:1:8: F401 `os` imported but unused
resources/test/project/project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted resources/test/project/project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
Found 7 error(s). Found 7 error(s).
6 potentially fixable with the --fix option. 7 potentially fixable with the --fix option.
``` ```
Running from the project directory itself should exhibit the same behavior: Running from the project directory itself should exhibit the same behavior:
@ -32,7 +32,7 @@ examples/docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never
project/file.py:1:8: F401 `os` imported but unused project/file.py:1:8: F401 `os` imported but unused
project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted project/import_file.py:1:1: I001 Import block is un-sorted or un-formatted
Found 7 error(s). Found 7 error(s).
6 potentially fixable with the --fix option. 7 potentially fixable with the --fix option.
``` ```
Running from the sub-package directory should exhibit the same behavior, but omit the top-level Running from the sub-package directory should exhibit the same behavior, but omit the top-level
@ -43,7 +43,7 @@ files:
docs/file.py:1:1: I001 Import block is un-sorted or un-formatted docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
docs/file.py:8:5: F841 Local variable `x` is assigned to but never used docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
Found 2 error(s). Found 2 error(s).
1 potentially fixable with the --fix option. 2 potentially fixable with the --fix option.
``` ```
`--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve `--config` should force Ruff to use the specified `pyproject.toml` for all files, and resolve
@ -74,7 +74,7 @@ docs/docs/file.py:1:1: I001 Import block is un-sorted or un-formatted
docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used docs/docs/file.py:8:5: F841 Local variable `x` is assigned to but never used
excluded/script.py:5:5: F841 Local variable `x` is assigned to but never used excluded/script.py:5:5: F841 Local variable `x` is assigned to but never used
Found 4 error(s). Found 4 error(s).
1 potentially fixable with the --fix option. 4 potentially fixable with the --fix option.
``` ```
Passing an excluded directory directly should report errors in the contained files: Passing an excluded directory directly should report errors in the contained files:

66
src/resolver.rs
View File

@ -232,12 +232,14 @@ pub fn python_files_in_path(
// Search for `pyproject.toml` files in all parent directories. // Search for `pyproject.toml` files in all parent directories.
let mut resolver = Resolver::default(); let mut resolver = Resolver::default();
for path in &paths { if matches!(pyproject_strategy, PyprojectDiscovery::Hierarchical(..)) {
for ancestor in path.ancestors() { for path in &paths {
if let Some(pyproject) = settings_toml(ancestor)? { for ancestor in path.ancestors() {
let (root, settings) = if let Some(pyproject) = settings_toml(ancestor)? {
resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?; let (root, settings) =
resolver.add(root, settings); resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?;
resolver.add(root, settings);
}
} }
} }
} }
@ -272,29 +274,31 @@ pub fn python_files_in_path(
Box::new(|result| { Box::new(|result| {
// Search for the `pyproject.toml` file in this directory, before we visit any // Search for the `pyproject.toml` file in this directory, before we visit any
// of its contents. // of its contents.
if let Ok(entry) = &result { if matches!(pyproject_strategy, PyprojectDiscovery::Hierarchical(..)) {
if entry if let Ok(entry) = &result {
.file_type() if entry
.map_or(false, |file_type| file_type.is_dir()) .file_type()
{ .map_or(false, |file_type| file_type.is_dir())
match settings_toml(entry.path()) { {
Ok(Some(pyproject)) => match resolve_scoped_settings( match settings_toml(entry.path()) {
&pyproject, Ok(Some(pyproject)) => match resolve_scoped_settings(
&Relativity::Parent, &pyproject,
processor, &Relativity::Parent,
) { processor,
Ok((root, settings)) => { ) {
resolver.write().unwrap().add(root, settings); Ok((root, settings)) => {
} resolver.write().unwrap().add(root, settings);
}
Err(err) => {
*error.lock().unwrap() = Err(err);
return WalkState::Quit;
}
},
Ok(None) => {}
Err(err) => { Err(err) => {
*error.lock().unwrap() = Err(err); *error.lock().unwrap() = Err(err);
return WalkState::Quit; return WalkState::Quit;
} }
},
Ok(None) => {}
Err(err) => {
*error.lock().unwrap() = Err(err);
return WalkState::Quit;
} }
} }
} }
@ -366,11 +370,13 @@ pub fn python_file_at_path(
// Search for `pyproject.toml` files in all parent directories. // Search for `pyproject.toml` files in all parent directories.
let mut resolver = Resolver::default(); let mut resolver = Resolver::default();
for ancestor in path.ancestors() { if matches!(pyproject_strategy, PyprojectDiscovery::Hierarchical(..)) {
if let Some(pyproject) = settings_toml(ancestor)? { for ancestor in path.ancestors() {
let (root, settings) = if let Some(pyproject) = settings_toml(ancestor)? {
resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?; let (root, settings) =
resolver.add(root, settings); resolve_scoped_settings(&pyproject, &Relativity::Parent, processor)?;
resolver.add(root, settings);
}
} }
} }