Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions crates/uv-installer/src/satisfies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@ impl RequirementSatisfaction {
DirInfo {
editable: installed_editable,
},
subdirectory: None,
} = direct_url.as_ref()
else {
return Self::Mismatch;
Expand Down
19 changes: 17 additions & 2 deletions crates/uv-pypi-types/src/direct_url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ pub enum DirectUrl {
/// ```json
/// {"url": "file:///home/user/project", "dir_info": {}}
/// ```
LocalDirectory { url: String, dir_info: DirInfo },
LocalDirectory {
url: String,
dir_info: DirInfo,
#[serde(skip_serializing_if = "Option::is_none")]
subdirectory: Option<Box<Path>>,
},
/// The direct URL is a path to an archive. For example:
/// ```json
/// {"archive_info": {"hash": "sha256=75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8", "hashes": {"sha256": "75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8"}}, "url": "https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl"}
Expand Down Expand Up @@ -92,7 +97,17 @@ impl TryFrom<&DirectUrl> for Url {

fn try_from(value: &DirectUrl) -> Result<Self, Self::Error> {
match value {
DirectUrl::LocalDirectory { url, .. } => Self::parse(url),
DirectUrl::LocalDirectory {
url,
subdirectory,
dir_info: _,
} => {
let mut url = Self::parse(url)?;
if let Some(subdirectory) = subdirectory {
url.set_fragment(Some(&format!("subdirectory={}", subdirectory.display())));
}
Ok(url)
}
DirectUrl::ArchiveUrl {
url,
subdirectory,
Expand Down
1 change: 1 addition & 0 deletions crates/uv-pypi-types/src/parsed_url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ impl From<&ParsedDirectoryUrl> for DirectUrl {
dir_info: DirInfo {
editable: value.editable.then_some(true),
},
subdirectory: None,
}
}
}
Expand Down
Loading