admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uv step (#1121)

Browse Source
This commit is contained in:
Gideon
2025-04-13 10:07:57 +02:00
committed by GitHub
parent 0423c836eb
commit 397a537eef
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/steps/generic.rs
View File

@@ -1316,20 +1316,32 @@ pub fn run_uv(ctx: &ExecutionContext) -> Result<()> {
.execute(&uv_exec) .execute(&uv_exec)
.arg("--version") .arg("--version")
.output_checked_utf8()?; .output_checked_utf8()?;
// example output: "uv 0.5.11 (c4d0caaee 2024-12-19)\n" // Multiple possible output formats are possible according to uv source code
//
// https://github.com/astral-sh/uv/blob/6b7f60c1eaa840c2e933a0fb056ab46f99c991a5/crates/uv-cli/src/version.rs#L28-L42
//
// For example:
// "uv 0.5.11 (c4d0caaee 2024-12-19)\n"
// "uv 0.5.11+1 (xxxd0cee 2024-12-20)\n"
// "uv 0.6.14\n"
let uv_version_output_stdout = uv_version_output.stdout; let uv_version_output_stdout = uv_version_output.stdout;
let version_str = { let version_str = {
// trim the starting "uv" and " " (whitespace) // Trim the starting "uv" and " " (whitespace)
let start_trimmed = uv_version_output_stdout let start_trimmed = uv_version_output_stdout
.trim_start_matches("uv") .trim_start_matches("uv")
.trim_start_matches(' '); .trim_start_matches(' ');
// remove the tailing part " (c4d0caaee 2024-12-19)\n" // Remove the tailing part " (c4d0caaee 2024-12-19)\n", if it's there
let first_whitespace_index = start_trimmed match start_trimmed.find(' ') {
.find(' ') None => start_trimmed.trim_end_matches('\n'), // Otherwise, just strip the newline
.expect("the output of `uv --version` changed, please file an issue to Topgrade"); Some(i) => &start_trimmed[..i],
// this should be our version str "0.5.11" }
&start_trimmed[..first_whitespace_index]
// After trimming, it should be a string in 2 possible formats, both can be handled by `Version::parse()`
//
// 1. "0.5.11"
// 2. "0.5.11+1"
}; };
let version = let version =
Version::parse(version_str).expect("the output of `uv --version` changed, please file an issue to Topgrade"); Version::parse(version_str).expect("the output of `uv --version` changed, please file an issue to Topgrade");