mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Improve error messages

Browse source
This commit is contained in:
Zanie 2023-11-06 14:12:36 -06:00
parent 7301a350f9
commit 7435236773
4 changed files with 4 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap
View file

@ -1,19 +0,0 @@
---
source: crates/puffin-cli/tests/pip_compile.rs
info:
program: puffin
args:
- pip-compile
- pyproject.toml
- "--cache-dir"
- /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpHT5k4n
env:
VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpS0cCaw/.venv
---
success: false
exit_code: 2
----- stdout -----
----- stderr -----
error: Conflicting versions for package `django`: ==3.0 is incompatible with >5.0

19
crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap
View file

@ -1,19 +0,0 @@
---
source: crates/puffin-cli/tests/pip_compile.rs
info:
program: puffin
args:
- pip-compile
- pyproject.toml
- "--cache-dir"
- /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpgsozkO
env:
VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpwjg05J/.venv
---
success: false
exit_code: 2
----- stdout -----
----- stderr -----
error: Conflicting versions for package `django`: ==5.0b1 is incompatible with ==5.0a1

6
crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap
View file

@ -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`

2
crates/puffin-resolver/src/error.rs
View file

@ -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.")]