Enable global configuration files #3049
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
commented
Apr 16, 2024
| @@ -75,6 +75,7 @@ dashmap = { version = "5.5.3" } | |||
| data-encoding = { version = "2.5.0" } | |||
| derivative = { version = "2.2.0" } | |||
| directories = { version = "5.0.1" } | |||
| dirs-sys = { version = "0.4.1" } | |||
There was a problem hiding this comment.
This is already a dependency because it powers directories under-the-hood, but exposes the low-level methods we need to use the custom XDG behavior.
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
31a5129 to
9d7a449
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
3e8f657 to
9fcddd4
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
9d7a449 to
d359ea8
Compare
zanieb
approved these changes
Apr 16, 2024
zanieb
reviewed
Apr 16, 2024
crates/uv-workspace/src/workspace.rs
Outdated
Comment on lines
16
to
18
| /// Load the global [`Workspace`]. | ||
| pub fn global() -> Result<Option<Self>, WorkspaceError> { |
There was a problem hiding this comment.
Can we call this "user" instead? It's not the "global" or "system" workspace, it sounds like it should always be scoped to a user e.g. XDG_CONFIG_HOME is for user-specific configuration.
konstin
approved these changes
Apr 16, 2024
| @@ -38,6 +51,27 @@ impl Workspace { | |||
| } | |||
| } | |||
|
|
|||
| /// Returns the path to the global configuration directory. | |||
| /// | |||
| /// This is similar to the `config_dir()` returned by the `dirs` crate, but it uses the | |||
There was a problem hiding this comment.
I'm somewhat hesitant to diverge from the rust standard of using dirs here, can we file an upstream issue and link to the github discussion for this?
There was a problem hiding this comment.
You should chime in here: astral-sh/ruff#10739
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
9fcddd4 to
84e48b3
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
d359ea8 to
986b745
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
84e48b3 to
50fa1a7
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
986b745 to
17b6acb
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
50fa1a7 to
c859405
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
17b6acb to
ba0f96e
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
c859405 to
53ff358
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
ba0f96e to
fd76507
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
53ff358 to
082c731
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
fd76507 to
a04df02
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
082c731 to
0395946
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
a04df02 to
78691ee
Compare
charliermarsh
force-pushed
the
charlie/workspace-iv
branch
from
0395946 to
6776a14
Compare
charliermarsh
force-pushed
the
charlie/workspace-v
branch
from
78691ee to
d510125
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
Enables
uvto read configuration from (e.g.)/Users/crmarsh/.config/uv/uv.tomlon macOS and Linux, andC:\Users\Charlie\AppData\Roaming\uv\uv.tomlon Windows.This differs slightly from Ruff, which uses the
Application Supportdirectory on macOS. But I've deviated here. based on the preferences expressed in astral-sh/ruff#10739.