diff --git a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements.snap b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements.snap index 850d1f32d..61a6e7f1e 100644 --- a/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements.snap +++ b/crates/puffin-cli/tests/snapshots/pip_compile__compile_unsolvable_requirements.snap @@ -6,9 +6,9 @@ info: - pip-compile - pyproject.toml - "--cache-dir" - - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpmN6eIS + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpN531dN env: - VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpaj2K70/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmp99w9dK/.venv --- success: false exit_code: 1 @@ -16,5 +16,5 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: - ╰─▶ my-project depends on django ∅ + ╰─▶ my-project depends on django∅ 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 efadf2a19..dbc5bd786 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/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpVyrxMG + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpleIayX env: - VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpF8a4y3/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmp24qRXe/.venv --- success: false exit_code: 1 @@ -16,5 +16,5 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: - ╰─▶ root depends on werkzeug 3.0.0 + ╰─▶ root depends on werkzeug==3.0.0 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 7974bc9a3..bfd72f48e 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/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmpb7ldgy + - /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpfXoEZG env: - VIRTUAL_ENV: /var/folders/nt/6gf2v7_s3k13zq_t3944rwz40000gn/T/.tmp6FMPGr/.venv + VIRTUAL_ENV: /var/folders/bc/qlsk3t6x7c9fhhbvvcg68k9c0000gp/T/.tmpJkukgJ/.venv --- success: false exit_code: 1 @@ -16,6 +16,6 @@ exit_code: 1 ----- stderr ----- × No solution found when resolving dependencies: - ╰─▶ Because flask 3.0.0 depends on werkzeug >=3.0.0 and root 0a0.dev0 - depends on flask 3.0.0, root 0a0.dev0 is forbidden. + ╰─▶ Because flask ==3.0.0 depends on werkzeug >=3.0.0 and root ==0a0.dev0 + depends on flask ==3.0.0, root ==0a0.dev0 is forbidden. diff --git a/crates/puffin-resolver/src/pubgrub/report.rs b/crates/puffin-resolver/src/pubgrub/report.rs index d194c2b8f..56b402290 100644 --- a/crates/puffin-resolver/src/pubgrub/report.rs +++ b/crates/puffin-resolver/src/pubgrub/report.rs @@ -383,22 +383,22 @@ impl fmt::Display for PuffinExternal { if package_set == &Range::full() && dependency_set == &Range::full() { write!(f, "{package} depends on {dependency}") } else if package_set == &Range::full() { - write!(f, "{package} depends on {dependency} {dependency_set}") + write!(f, "{package} depends on {dependency}{dependency_set}") } else if dependency_set == &Range::full() { if matches!(package, PubGrubPackage::Root(_)) { // Exclude the dummy version for root packages write!(f, "{package} depends on {dependency}") } else { - write!(f, "{package} {package_set} depends on {dependency}") + write!(f, "{package}{package_set} depends on {dependency}") } } else { if matches!(package, PubGrubPackage::Root(_)) { // Exclude the dummy version for root packages - write!(f, "{package} depends on {dependency} {dependency_set}") + write!(f, "{package} depends on {dependency}{dependency_set}") } else { write!( f, - "{package} {package_set} depends on {dependency} {dependency_set}" + "{package}{package_set} depends on {dependency}{dependency_set}" ) } } diff --git a/vendor/pubgrub/src/range.rs b/vendor/pubgrub/src/range.rs index fe2aaef4a..47e76e44f 100644 --- a/vendor/pubgrub/src/range.rs +++ b/vendor/pubgrub/src/range.rs @@ -382,7 +382,7 @@ impl Display for Range { (Included(v), Unbounded) => write!(f, ">={v}")?, (Included(v), Included(b)) => { if v == b { - write!(f, "{v}")? + write!(f, "=={v}")? } else { write!(f, ">={v},<={b}")? }