diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_version_not_available.snap b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_version_not_available.snap index 5c6ddaa8c..9cf569fa5 100644 --- a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_version_not_available.snap +++ b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements_version_not_available.snap @@ -6,9 +6,9 @@ info: - pip-compile - pyproject.toml - "--cache-dir" - - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmp2JLrkd + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpCU1Ejn env: - VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmp0ZV4ob/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpnY10Er/.venv --- success: false exit_code: 1 @@ -17,5 +17,5 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: ╰─▶ Because there is no version of django available matching ==300.1.4 and - my-project depends on django==300.1.4, my-project cannot be satisfied. + my-project depends on django==300.1.4, version solving failed. diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_direct_url_dependency.snap b/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_direct_url_dependency.snap index 15f306e31..2cb80fe64 100644 --- a/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_direct_url_dependency.snap +++ b/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_direct_url_dependency.snap @@ -6,9 +6,9 @@ info: - pip-compile - requirements.in - "--cache-dir" - - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpYAeXfn + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpZftc6D env: - VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpf7hodD/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpuYGAMB/.venv --- success: false exit_code: 1 @@ -17,5 +17,5 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: ╰─▶ Because there is no version of werkzeug available matching ==3.0.0 and - root depends on werkzeug==3.0.0, root cannot be satisfied. + root depends on werkzeug==3.0.0, version solving failed. diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_transitive_url_dependency.snap b/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_transitive_url_dependency.snap index fee3eeb23..802e0f5da 100644 --- a/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_transitive_url_dependency.snap +++ b/crates/puffin-cli/tests/snapshots/pip_compile__conflicting_transitive_url_dependency.snap @@ -6,9 +6,9 @@ info: - pip-compile - requirements.in - "--cache-dir" - - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpiccUSp + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpMkgmyj env: - VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpCLX1o7/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpGndWSU/.venv --- success: false exit_code: 1 @@ -17,6 +17,6 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: ╰─▶ Because there is no version of werkzeug available matching >=3.0.0 and - flask==3.0.0 depends on werkzeug>=3.0.0, flask ==3.0.0 is forbidden. - And because root depends on flask==3.0.0, root cannot be satisfied. + flask==3.0.0 depends on werkzeug>=3.0.0, flask==3.0.0 is forbidden. + And because root depends on flask==3.0.0, version solving failed. diff --git a/crates/puffin-resolver/src/pubgrub/report.rs b/crates/puffin-resolver/src/pubgrub/report.rs index 495e4aed7..3565205a2 100644 --- a/crates/puffin-resolver/src/pubgrub/report.rs +++ b/crates/puffin-resolver/src/pubgrub/report.rs @@ -268,15 +268,12 @@ impl ResolutionFailureReporter { pub fn string_terms(terms: &Map>>) -> String { let terms_vec: Vec<_> = terms.iter().collect(); match terms_vec.as_slice() { - [] => "version solving failed".into(), - [(package @ PubGrubPackage::Root(_), _)] => { - format!("{package} cannot be satisfied") - } + [] | [(PubGrubPackage::Root(_), _)] => "version solving failed".into(), [(package @ PubGrubPackage::Package(..), Term::Positive(range))] => { - format!("{package} {range} is forbidden") + format!("{package}{range} is forbidden") } [(package @ PubGrubPackage::Package(..), Term::Negative(range))] => { - format!("{package} {range} is mandatory") + format!("{package}{range} is mandatory") } [(p1, Term::Positive(r1)), (p2, Term::Negative(r2))] => { PuffinExternal::FromDependencyOf(