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
18 changes: 15 additions & 3 deletions crates/uv-requirements-txt/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,19 @@ fn parse_entry(
end,
}
} else if s.eat_if("-e") || s.eat_if("--editable") {
s.eat_whitespace();
if s.eat_if('=') {
// Explicit equals sign.
} else if s.eat_if(char::is_whitespace) {
// Key and value are separated by whitespace instead.
s.eat_whitespace();
} else {
let (line, column) = calculate_row_column(content, s.cursor());
return Err(RequirementsTxtParserError::Parser {
message: format!("Expected '=' or whitespace, found {:?}", s.peek()),
line,
column,
});
}

let source = if requirements_txt == Path::new("-") {
None
Expand Down Expand Up @@ -851,10 +863,10 @@ fn parse_value<'a, T>(
while_pattern: impl Pattern<T>,
) -> Result<&'a str, RequirementsTxtParserError> {
if s.eat_if('=') {
// Explicit equals sign
// Explicit equals sign.
Ok(s.eat_while(while_pattern).trim_end())
} else if s.eat_if(char::is_whitespace) {
// Key and value are separated by whitespace instead
// Key and value are separated by whitespace instead.
s.eat_whitespace();
Ok(s.eat_while(while_pattern).trim_end())
} else {
Expand Down
54 changes: 54 additions & 0 deletions crates/uv/tests/it/pip_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1302,6 +1302,60 @@ fn install_editable_pep_508_requirements_txt() -> Result<()> {
"###
);

requirements_txt.write_str(&indoc::formatdoc! {r"
--editable black[d] @ file://{workspace_root}/scripts/packages/black_editable
",
workspace_root = context.workspace_root.simplified_display(),
})?;

uv_snapshot!(context.filters(), context.pip_install()
.arg("-r")
.arg("requirements.txt"), @r###"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Audited 1 package in [TIME]
"###
);

requirements_txt.write_str(&indoc::formatdoc! {r"
--editable=black[d] @ file://{workspace_root}/scripts/packages/black_editable
",
workspace_root = context.workspace_root.simplified_display(),
})?;

uv_snapshot!(context.filters(), context.pip_install()
.arg("-r")
.arg("requirements.txt"), @r###"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Audited 1 package in [TIME]
"###
);

requirements_txt.write_str(&indoc::formatdoc! {r"
--editable= black[d] @ file://{workspace_root}/scripts/packages/black_editable
",
workspace_root = context.workspace_root.simplified_display(),
})?;

uv_snapshot!(context.filters(), context.pip_install()
.arg("-r")
.arg("requirements.txt"), @r###"
success: true
exit_code: 0
----- stdout -----

----- stderr -----
Audited 1 package in [TIME]
"###
);

Ok(())
}

Expand Down