mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-09-30 22:11:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Git URL construction in tool.uv.sources (#3365)

Browse source 
## Summary

We were including the `git+` prefix twice:

```
DEBUG At least one requirement is not satisfied: boltons @ git+git+https://github.com/mahmoud/boltons@57fbaa9b673ed85b32458b31baeeae230520e4a0@57fbaa9b673ed85b32458b31baeeae230520e4a0
```

## Test Plan

Extended the test to include a Git URL; verified that we don't trigger a
reinstall.
This commit is contained in:
Charlie Marsh 2024-05-03 23:02:14 -04:00 • committed by GitHub
parent 44858bc28d
commit 8adf5b11ab
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/uv-requirements/src/pyproject.rs
View file

@ -441,18 +441,18 @@ pub(crate) fn lower_requirement(
_ => return Err(LoweringError::MoreThanOneGitRef), _ => return Err(LoweringError::MoreThanOneGitRef),
}; };
// Create a PEP 508-compatible URL.
let mut url = Url::parse(&format!("git+{git}"))?; let mut url = Url::parse(&format!("git+{git}"))?;
let mut given = git.to_string();
if let Some(rev) = reference.as_str() { if let Some(rev) = reference.as_str() {
url.set_path(&format!("{}@{}", url.path(), rev)); url.set_path(&format!("{}@{}", url.path(), rev));
given = format!("{given}@{rev}");
} }
if let Some(subdirectory) = &subdirectory { if let Some(subdirectory) = &subdirectory {
url.set_fragment(Some(&format!("subdirectory={subdirectory}"))); url.set_fragment(Some(&format!("subdirectory={subdirectory}")));
given = format!("{given}#subdirectory={subdirectory}");
} }
let url = VerbatimUrl::from_url(url).with_given(given); let url = VerbatimUrl::from_url(url);
let repository = url.to_url().clone();
let repository = git.clone();
RequirementSource::Git { RequirementSource::Git {
url, url,
repository, repository,

6
crates/uv/tests/pip_install.rs
View file

@ -4667,13 +4667,15 @@ fn tool_uv_sources() -> Result<()> {
uv_snapshot!(context.filters(), windows_filters=false, context.install() uv_snapshot!(context.filters(), windows_filters=false, context.install()
.arg("--preview") .arg("--preview")
.arg("-r") .arg("-r")
.arg(require_path), @r###" .arg(require_path)
.arg("--extra")
.arg("utils"), @r###"
success: true success: true
exit_code: 0 exit_code: 0
----- stdout ----- ----- stdout -----
----- stderr ----- ----- stderr -----
Audited 5 packages in [TIME] Audited 6 packages in [TIME]
"### "###
); );
Ok(()) Ok(())