diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap deleted file mode 100644 index 4e6ec7bad..000000000 --- a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_mixed_ranges.snap +++ /dev/null @@ -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 - diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap deleted file mode 100644 index 6adb6aa47..000000000 --- a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_pinned.snap +++ /dev/null @@ -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 - diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap index 70907d135..215ce68b6 100644 --- a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_direct_ranges.snap +++ b/crates/puffin-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 index 887283d7f..6639d4326 100644 --- 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, Range), #[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.")]