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
44 changes: 40 additions & 4 deletions crates/pixi_pypi_spec/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -624,15 +624,51 @@ mod tests {
assert_eq!(
as_pypi_req,
PixiPypiSpec::new(PixiPypiSource::Path {
path: pixi_spec::Verbatim::new_with_given(
PathBuf::from("/path/to/boltons"),
"/path/to/boltons".to_string(),
),
path: pixi_spec::Verbatim::new(PathBuf::from("/path/to/boltons")),
editable: None,
})
);
}

#[test]
fn test_pep508_file_url_serializes_as_path() {
// Regression: a `file://` URL in a PEP 508 requirement must round-trip
// through the manifest as a filesystem path, NOT as `path = "file://..."`.
// The latter is unloadable because, on reload, the string is treated as
// a relative PathBuf and joined with the project root.
// See prefix-dev/pixi#6071.
#[cfg(target_os = "windows")]
let pypi: pep508_rs::Requirement = "boltons @ file:///C:/path/to/boltons".parse().unwrap();
#[cfg(not(target_os = "windows"))]
let pypi: pep508_rs::Requirement = "boltons @ file:///path/to/boltons".parse().unwrap();

let as_pypi_req: PixiPypiSpec = pypi.try_into().unwrap();
let serialized = as_pypi_req.to_string();
assert!(
!serialized.contains("file://"),
"serialized PixiPypiSpec must not contain `file://`, got: {serialized}",
);
}

#[test]
fn test_pep508_relative_path_preserves_given() {
// Counterpart to `test_pep508_file_url_serializes_as_path`: when the
// user writes a *bare relative path* (pep508_rs's non-PEP-508 extension),
// we must keep their original spelling as `given` so the lockfile and
// manifest stay portable. Only the `file://` URL form should be discarded.
let working_dir = std::env::temp_dir();
let pypi: pep508_rs::Requirement =
pep508_rs::Requirement::parse("mine @ ./mine", &working_dir).unwrap();

let as_pypi_req: PixiPypiSpec = pypi.try_into().unwrap();
match as_pypi_req.source() {
PixiPypiSource::Path { path, .. } => {
assert_eq!(path.given(), Some("./mine"));
}
other => panic!("expected Path source, got {other:?}"),
}
}

#[test]
fn test_pep508_git_url() {
let parsed = pep508_rs::Requirement::from_str(
Expand Down
15 changes: 10 additions & 5 deletions crates/pixi_pypi_spec/src/pep508.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,19 @@ impl TryFrom<pep508_rs::Requirement> for PixiPypiSpec {
req.marker,
)
} else if url.scheme().eq_ignore_ascii_case("file") {
// Convert the file url to a path.
// Convert the file URL to a filesystem path. Preserve `u.given()`
// only when it is already in path form (e.g. `./mine`, `/abs/p`):
// the destination `path = "..."` field expects a filesystem path,
// so a `file://...` `given` would round-trip into an unloadable
// manifest. See prefix-dev/pixi#6071.
let file = url.to_file_path().map_err(|_| {
Pep508ToPyPiRequirementError::PathUrlIntoPath(url.clone())
})?;
let path = if let Some(g) = u.given() {
Verbatim::new_with_given(file, g.to_string())
} else {
Verbatim::new(file)
let path = match u.given() {
Some(g) if !g.starts_with("file:") => {
Verbatim::new_with_given(file, g.to_string())
}
_ => Verbatim::new(file),
};
PixiPypiSpec::with_extras_and_markers(
PixiPypiSource::Path {
Expand Down
Loading