Skip to content

Do not show empty version specifier in uv tool list #9605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Dec 3, 2024
Merged

Do not show empty version specifier in uv tool list #9605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion crates/uv/src/commands/tool/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ pub(crate) async fn list(
.map(|req| req.source.to_string())
.filter(|s| !s.is_empty())
.join(", ");
format!(" [required: {specifiers}]")
if specifiers.is_empty() {
String::new()
} else {
format!(" [required: {specifiers}]")
}
} else {
String::new()
};
Expand Down
23 changes: 18 additions & 5 deletions crates/uv/tests/it/tool_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fn tool_list_show_version_specifiers() {
let tool_dir = context.temp_dir.child("tools");
let bin_dir = context.temp_dir.child("bin");

// Install `black`
// Install `black` with a version specifier
context
.tool_install()
.arg("black<24.3.0")
Expand All @@ -265,30 +265,43 @@ fn tool_list_show_version_specifiers() {
.assert()
.success();

// Install `flask`
context
.tool_install()
.arg("flask")
.env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str())
.assert()
.success();

uv_snapshot!(context.filters(), context.tool_list().arg("--show-version-specifiers")
.env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r###"
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r#"
success: true
exit_code: 0
----- stdout -----
black v24.2.0 [required: <24.3.0]
- black
- blackd
flask v3.0.2
- flask

----- stderr -----
"###);
"#);

// with paths
uv_snapshot!(context.filters(), context.tool_list().arg("--show-version-specifiers").arg("--show-paths")
.env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r###"
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str()), @r#"
success: true
exit_code: 0
----- stdout -----
black v24.2.0 [required: <24.3.0] ([TEMP_DIR]/tools/black)
- black ([TEMP_DIR]/bin/black)
- blackd ([TEMP_DIR]/bin/blackd)
flask v3.0.2 ([TEMP_DIR]/tools/flask)
- flask ([TEMP_DIR]/bin/flask)

----- stderr -----
"###);
"#);
}