Read persistent configuration from non-workspace pyproject.toml
#4526
Conversation
This file contains 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
force-pushed
the
charlie/poetry
branch
from
ee55ce9
to
3e0a146
Compare
zanieb
reviewed
Jun 25, 2024
Comment on lines
-64
to
-72
| // Read a `uv.toml` file in the current directory. | ||
| let path = ancestor.join("uv.toml"); | ||
| match fs_err::read_to_string(&path) { | ||
| Ok(content) => { | ||
| let options: Options = toml::from_str(&content) | ||
| .map_err(|err| Error::UvToml(path.user_display().to_string(), err))?; | ||
|
|
||
| debug!("Found workspace configuration at `{}`", path.display()); | ||
| return Ok(Some(Self(options))); |
There was a problem hiding this comment.
Did you mean to drop this? Does this happen elsewhere now somehow?
There was a problem hiding this comment.
Yeah this is in from_directory.
zanieb
approved these changes
Jun 25, 2024
|
I'll add a test too. |
charliermarsh
force-pushed
the
charlie/poetry
branch
from
3e0a146
to
a90a309
Compare
charliermarsh
force-pushed
the
charlie/poetry
branch
from
a90a309
to
d0fbf82
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
If the user puts their configuration in a
pyproject.tomlthat isn't a valid workspace root (e.g., it's a Poetry file), we won't discover it, because we only look inuv.tomlfiles in that case. I think this is somewhat debatable... We could choose to requireuv.tomlthere, but as a user I'd probably expect it to work?Closes #4521.