Load configuration options from workspace root #4295
Merged
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/configuration-ii
branch
from
623d2da
to
1910c25
Compare
charliermarsh
commented
Jun 13, 2024
| // configuration file. | ||
| // 3. The nearest `uv.toml` file in the directory tree, starting from the current directory. If | ||
| // found, this file is combined with the user configuration file. In this case, we don't | ||
| // search for `pyproject.toml` files, since we're not in a workspace. |
There was a problem hiding this comment.
Rules are explained here, in more detail.
charliermarsh
force-pushed
the
charlie/configuration-ii
branch
from
1910c25
to
98200f6
Compare
|
It's a bit confusing that configuration in a workspace member will effectively be ignored. Something to revisit in the future, I think. |
charliermarsh
added
configuration
charliermarsh
force-pushed
the
charlie/configuration-ii
branch
from
98200f6
to
20cc09f
Compare
That seems pretty problematic :D |
zanieb
reviewed
Jun 13, 2024
zanieb
approved these changes
Jun 13, 2024
|
I know it's a hard question, but what do you think the semantics should be? None of the options are enforceable on a per-package basis. |
|
I'm not sure yet. I think I need to play with a real workspace setup first. I think we'd need to be able to map a tree of dependencies to their source project in the workspace to be able to enforce things, right? It seems like it would require a lot of changes. |
charliermarsh
force-pushed
the
charlie/configuration
branch
6 times, most recently
from
16de0ce
to
164b8e5
Compare
charliermarsh
force-pushed
the
charlie/configuration-ii
branch
from
20cc09f
to
8c73a0a
Compare
charliermarsh
force-pushed
the
charlie/configuration-ii
branch
from
8c73a0a
to
fcc0788
Compare
charliermarsh
added a commit
that referenced
this pull request
Aug 8, 2024
## Summary Previously, we wouldn't respect configuration files in directories _above_ a workspace root. But this is somewhat problematic, because any `pyproject.toml` will define a workspace root... Instead, I think we should _start_ the search at the workspace root, but go above it if necessary. Closes: #5929. See: #4295.
zanieb
pushed a commit
that referenced
this pull request
Aug 9, 2024
Previously, we wouldn't respect configuration files in directories _above_ a workspace root. But this is somewhat problematic, because any `pyproject.toml` will define a workspace root... Instead, I think we should _start_ the search at the workspace root, but go above it if necessary. Closes: #5929. See: #4295.
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
In a workspace, we now read configuration from the workspace root. Previously, we read configuration from the first
pyproject.tomloruv.tomlfile in path -- but in a workspace, that would often be the project rather than the workspace configuration.We need to read configuration from the workspace root, rather than its members, because we lock the workspace globally, so all configuration applies to the workspace globally.
As part of this change, the
uv-workspacecrate has been renamed touv-settingsand its purpose has been narrowed significantly (it no longer discovers a workspace; instead, it just reads the settings from a directory).If a user has a
uv.tomlin their directory or in a parent directory but is not in a workspace, we will still respect that use-case as before.Closes #4249.