Improve error messages

astral-sh · Nov 6, 2023 · 22edf48 · 22edf48
1 parent 6de7af0
commit 22edf48
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/...cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap b/...cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap
@@ -6,14 +6,14 @@ info:
     - pip-compile
     - pyproject.toml
     - "--cache-dir"
-    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmphBLBd5
+    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpHUbtvr
   env:
-    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpImtQQU/.venv
+    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpb6Epeh/.venv
 ---
 success: false
 exit_code: 2
 ----- stdout -----
 
 ----- stderr -----
-error: Conflicting versions for package `django`: 3.0 is incompatible with >5.0
+error: Conflicting versions requested for package `django`: `3.0` is incompatible with `>5.0`
 
diff --git a/...uffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap b/...uffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap
@@ -6,14 +6,14 @@ info:
     - pip-compile
     - pyproject.toml
     - "--cache-dir"
-    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpa0ge2b
+    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpSPNdF0
   env:
-    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpMnAh94/.venv
+    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpjcHeJc/.venv
 ---
 success: false
 exit_code: 2
 ----- stdout -----
 
 ----- stderr -----
-error: Conflicting versions for package `django`: 5.0b1 is incompatible with 5.0a1
+error: Conflicting versions requested for package `django`: `5.0b1` is incompatible with `5.0a1`
 
diff --git a/...uffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap b/...uffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap
@@ -6,14 +6,14 @@ info:
     - pip-compile
     - pyproject.toml
     - "--cache-dir"
-    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpQZyk8c
+    - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpAFfkaN
   env:
-    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpOV0S3e/.venv
+    VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpOGc5nS/.venv
 ---
 success: false
 exit_code: 2
 ----- stdout -----
 
 ----- stderr -----
-error: Conflicting versions for package `django`: >=4.0 is incompatible with <=3.0
+error: Conflicting versions requested for package `django`: `>=4.0` is incompatible with `<=3.0`
 
diff --git a/crates/puffin-resolver/src/error.rs b/crates/puffin-resolver/src/error.rs
@@ -39,7 +39,7 @@ pub enum ResolveError {
     #[error("Conflicting URLs for package `{0}`: {1} and {2}")]
     ConflictingUrls(PackageName, String, String),
 
-    #[error("Conflicting versions for package `{0}`: {1} is incompatible with {2}")]
+    #[error("Conflicting versions requested for package `{0}`: `{1}` is incompatible with `{2}`")]
     ConflictingPackageVersions(PackageName, Range<PubGrubVersion>, Range<PubGrubVersion>),
 
     #[error("Package `{0}` attempted to resolve via URL: {1}. URL dependencies must be expressed as direct requirements or constraints. Consider adding `{0} @ {1}` to your dependencies or constraints file.")]