Python/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv synced 2026-01-22 22:10:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use keyring authentication when retrieving tool@latest version (#17448)

Browse Source 
Closes #17436

Co-authored-by: Claude <noreply@anthropic.com>
This commit is contained in:
Zanie Blue
2026-01-13 16:31:06 -06:00
committed by GitHub
parent c6a02873fd
commit 33c91159c6
3 changed files with 77 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
crates/uv/src/commands/tool/install.rs
View File

@@ -241,12 +241,17 @@ pub(crate) async fn install(
} = &request
{
// Build the registry client to fetch the latest version.
let client = RegistryClientBuilder::new(client_builder.clone(), cache.clone())
.index_locations(settings.resolver.index_locations.clone())
.index_strategy(settings.resolver.index_strategy)
.markers(interpreter.markers())
.platform(interpreter.platform())
.build();
let client = RegistryClientBuilder::new(
client_builder
.clone()
.keyring(settings.resolver.keyring_provider),
cache.clone(),
)
.index_locations(settings.resolver.index_locations.clone())
.index_strategy(settings.resolver.index_strategy)
.markers(interpreter.markers())
.platform(interpreter.platform())
.build();
// Initialize the capabilities.
let capabilities = IndexCapabilities::default();

17
crates/uv/src/commands/tool/run.rs
View File

@@ -918,12 +918,17 @@ async fn get_or_create_environment(
} = &request
{
// Build the registry client to fetch the latest version.
let client = RegistryClientBuilder::new(client_builder.clone(), cache.clone())
.index_locations(settings.resolver.index_locations.clone())
.index_strategy(settings.resolver.index_strategy)
.markers(interpreter.markers())
.platform(interpreter.platform())
.build();
let client = RegistryClientBuilder::new(
client_builder
.clone()
.keyring(settings.resolver.keyring_provider),
cache.clone(),
)
.index_locations(settings.resolver.index_locations.clone())
.index_strategy(settings.resolver.index_strategy)
.markers(interpreter.markers())
.platform(interpreter.platform())
.build();
// Initialize the capabilities.
let capabilities = IndexCapabilities::default();

56
crates/uv/tests/it/tool_run.rs
View File

@@ -1,4 +1,4 @@
use crate::common::{TestContext, uv_snapshot};
use crate::common::{TestContext, uv_snapshot, venv_bin_path};
use anyhow::Result;
use assert_cmd::prelude::*;
use assert_fs::prelude::*;
@@ -3506,3 +3506,57 @@ fn tool_run_windows_dotted_package_name() -> anyhow::Result<()> {
Ok(())
}
/// Regression test for <https://github.com/astral-sh/uv/issues/17436>
#[test]
fn tool_run_latest_keyring_auth() {
let keyring_context = TestContext::new("3.12");
// Install our keyring plugin
keyring_context
.pip_install()
.arg(
keyring_context
.workspace_root
.join("test")
.join("packages")
.join("keyring_test_plugin"),
)
.assert()
.success();
let context = TestContext::new("3.12")
.with_exclude_newer("2025-01-18T00:00:00Z")
.with_filtered_counts();
let tool_dir = context.temp_dir.child("tools");
let bin_dir = context.temp_dir.child("bin");
// Combine keyring venv bin with tool bin directory to avoid PATH warnings.
let path = std::env::join_paths([venv_bin_path(&keyring_context.venv), bin_dir.to_path_buf()])
.unwrap();
// Test that the keyring is consulted during the @latest version lookup.
uv_snapshot!(context.filters(), context.tool_install()
.arg("--index")
.arg("https://public@pypi-proxy.fly.dev/basic-auth/simple")
.arg("--keyring-provider")
.arg("subprocess")
.arg("executable-application@latest")
.env(EnvVars::UV_TOOL_DIR, tool_dir.as_os_str())
.env(EnvVars::XDG_BIN_HOME, bin_dir.as_os_str())
.env(EnvVars::KEYRING_TEST_CREDENTIALS, r#"{"pypi-proxy.fly.dev": {"public": "heron"}}"#)
.env(EnvVars::PATH, path), @r###"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Keyring request for public@https://pypi-proxy.fly.dev/basic-auth/simple
Keyring request for public@pypi-proxy.fly.dev
Resolved [N] packages in [TIME]
Prepared [N] packages in [TIME]
Installed [N] packages in [TIME]
+ executable-application==0.3.0
Installed 1 executable: app
"###);
}