Include configured src directories when resolving graphs
#22451
Merged
+145
−10
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
charliermarsh
changed the title
src directories when resolving graphs
|
MichaReiser
reviewed
Jan 8, 2026
Comment on lines
+74
to
+80
| pyproject_config | ||
| .settings | ||
| .linter | ||
| .src | ||
| .iter() | ||
| .filter(|path| path.is_dir()) | ||
| .filter_map(|path| SystemPathBuf::from_path_buf(path.clone()).ok()), |
Member
There was a problem hiding this comment.
This field supports globs. For example, if you have a series of Python packages in a python_modules directory, src = ["python_modules/*"] would expand to incorporate all packages in that directory. User home directory and environment variables will also be expanded.
Are globs and environment variables already expanded at this point?
Member
Author
There was a problem hiding this comment.
Yeah I believe so, I think they're expanded by the time they reach LinterSettings.
Diagnostic diff on typing conformance testsNo changes detected when running ty on typing conformance tests ✅ |
|
MichaReiser
approved these changes
Jan 8, 2026
Member
MichaReiser
left a comment
MichaReiser
left a comment
There was a problem hiding this comment.
Let's add a test using a glob for src to confirm that they're expanded at this point.
Comment on lines
70
to
88
| for path in &pyproject_config.settings.linter.src { | ||
| if path.is_dir() { | ||
| if let Ok(path) = SystemPathBuf::from_path_buf(path.clone()) { | ||
| src_roots.insert(path); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // Add detected package roots. | ||
| for path in package_roots | ||
| .values() | ||
| .filter_map(|package| package.as_deref()) | ||
| .filter_map(|package| package.parent()) | ||
| .map(Path::to_path_buf) | ||
| .filter_map(|path| SystemPathBuf::from_path_buf(path).ok()) | ||
| .collect(); | ||
| { | ||
| if let Some(parent) = path.parent() { | ||
| if let Ok(path) = SystemPathBuf::from_path_buf(parent.to_path_buf()) { | ||
| src_roots.insert(path); | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Nit:
src_roots.extend(
pyproject_config.settings.linter.src.iter()
.filter(|path| path.is_dir())
.filter_map(|path| SystemPathBuf::from_path_buf(path.clone());
...
Member
Author
|
🫡 |
charliermarsh
force-pushed
the
charlie/src
branch
from
d19d3a2 to
575dea9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR augments the detected source paths with the user-configured
srcwhen computing roots forruff analyze graph.