From e0e1211f2e9d6b9b2c6d0bf2ef0ed98bd6b4f5a2 Mon Sep 17 00:00:00 2001 From: konstin Date: Tue, 16 Jul 2024 21:10:53 +0200 Subject: [PATCH 1/3] Document that `--universal` implies `--no-strip-markers` Prompted by https://github.com/python-trio/trio/pull/3032#discussion_r1679435422 --- crates/uv-cli/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index 4fed29ac340e..31312a126df0 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -682,7 +682,7 @@ pub struct PipCompileArgs { /// Perform a universal resolution, attempting to generate a single `requirements.txt` output /// file that is compatible with all operating systems, architectures, and Python - /// implementations. + /// implementations. Implies `--no-strip-markers`. /// /// In universal mode, the current Python version (or user-provided `--python-version`) will be /// treated as a lower bound. For example, `--universal --python-version 3.7` would produce a From 06b004c5966e0bc9b98fc873cb30d7e24817c823 Mon Sep 17 00:00:00 2001 From: konstin Date: Wed, 17 Jul 2024 14:27:57 +0200 Subject: [PATCH 2/3] Move to body text --- crates/uv-cli/src/lib.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index 31312a126df0..6a74a120d090 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -682,15 +682,18 @@ pub struct PipCompileArgs { /// Perform a universal resolution, attempting to generate a single `requirements.txt` output /// file that is compatible with all operating systems, architectures, and Python - /// implementations. Implies `--no-strip-markers`. + /// implementations. /// /// In universal mode, the current Python version (or user-provided `--python-version`) will be /// treated as a lower bound. For example, `--universal --python-version 3.7` would produce a /// universal resolution for Python 3.7 and later. + /// + /// Using this option implies `--no-strip-markers`. #[arg( long, overrides_with("no_universal"), - conflicts_with("python_platform") + conflicts_with("python_platform"), + conflicts_with("strip_markers") )] pub universal: bool, From ec11eaa52371b0c51846e578bf4f5252d2b0469b Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 17 Jul 2024 11:46:05 -0400 Subject: [PATCH 3/3] Update lib.rs --- crates/uv-cli/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/uv-cli/src/lib.rs b/crates/uv-cli/src/lib.rs index 6a74a120d090..f6b7cbfc4673 100644 --- a/crates/uv-cli/src/lib.rs +++ b/crates/uv-cli/src/lib.rs @@ -688,7 +688,7 @@ pub struct PipCompileArgs { /// treated as a lower bound. For example, `--universal --python-version 3.7` would produce a /// universal resolution for Python 3.7 and later. /// - /// Using this option implies `--no-strip-markers`. + /// Implies `--no-strip-markers`. #[arg( long, overrides_with("no_universal"),