From 4e19e6846d9fe56343e79f143632c7d8cf6816d9 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Fri, 26 Jan 2024 18:56:10 -0800 Subject: [PATCH] Accept long form of pip arguments in `requirements.txt` (#1145) --- crates/requirements-txt/src/lib.rs | 6 +++--- .../test-data/requirements-txt/include-a.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/requirements-txt/src/lib.rs b/crates/requirements-txt/src/lib.rs index 37599d36a..0b5c165a4 100644 --- a/crates/requirements-txt/src/lib.rs +++ b/crates/requirements-txt/src/lib.rs @@ -343,7 +343,7 @@ fn parse_entry( } let start = s.cursor(); - Ok(Some(if s.eat_if("-r") { + Ok(Some(if s.eat_if("-r") || s.eat_if("--requirement") { let requirements_file = parse_value(s, |c: char| !['\n', '\r', '#'].contains(&c))?; let end = s.cursor(); eat_trailing_line(s)?; @@ -352,7 +352,7 @@ fn parse_entry( start, end, } - } else if s.eat_if("-c") { + } else if s.eat_if("-c") || s.eat_if("--constraint") { let constraints_file = parse_value(s, |c: char| !['\n', '\r', '#'].contains(&c))?; let end = s.cursor(); eat_trailing_line(s)?; @@ -361,7 +361,7 @@ fn parse_entry( start, end, } - } else if s.eat_if("-e") { + } else if s.eat_if("-e") || s.eat_if("--editable") { let path_or_url = parse_value(s, |c: char| !['\n', '\r'].contains(&c))?; let editable_requirement = EditableRequirement::parse(path_or_url, working_dir) .map_err(|err| err.with_offset(start))?; diff --git a/crates/requirements-txt/test-data/requirements-txt/include-a.txt b/crates/requirements-txt/test-data/requirements-txt/include-a.txt index 107116d78..34fea9c35 100644 --- a/crates/requirements-txt/test-data/requirements-txt/include-a.txt +++ b/crates/requirements-txt/test-data/requirements-txt/include-a.txt @@ -1,3 +1,3 @@ --r include-b.txt +--requirement include-b.txt numpy==1.24.2