Skip to content

Commit 31bf8eb

Browse files
authored
Update PubGrub (#8245)
1 parent 7730861 commit 31bf8eb

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ pathdiff = { version = "0.2.1" }
124124
petgraph = { version = "0.6.5" }
125125
platform-info = { version = "2.0.3" }
126126
proc-macro2 = { version = "1.0.86" }
127-
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "388685a8711092971930986644cfed152d1a1f6c" }
127+
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "19c77268c0ad5f69d7e12126e0cfacfbba466481" }
128128
quote = { version = "1.0.37" }
129129
rayon = { version = "1.10.0" }
130130
reflink-copy = { version = "0.1.19" }

crates/uv/tests/it/pip_install_scenarios.rs

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -335,30 +335,30 @@ fn excluded_only_compatible_version() {
335335
uv_snapshot!(filters, command(&context)
336336
.arg("excluded-only-compatible-version-a!=2.0.0")
337337
.arg("excluded-only-compatible-version-b<3.0.0,>=2.0.0")
338-
, @r#"
338+
, @r###"
339339
success: false
340340
exit_code: 1
341341
----- stdout -----
342342
343343
----- stderr -----
344344
× No solution found when resolving dependencies:
345-
╰─▶ Because only the following versions of package-a are available:
345+
╰─▶ Because package-a==1.0.0 depends on package-b==1.0.0 and only the following versions of package-a are available:
346346
package-a==1.0.0
347347
package-a==2.0.0
348348
package-a==3.0.0
349-
and package-a==1.0.0 depends on package-b==1.0.0, we can conclude that package-a<2.0.0 depends on package-b==1.0.0.
349+
we can conclude that package-a<2.0.0 depends on package-b==1.0.0.
350350
And because package-a==3.0.0 depends on package-b==3.0.0, we can conclude that all of:
351351
package-a<2.0.0
352352
package-a>2.0.0
353353
depend on one of:
354-
package-b==1.0.0
355-
package-b==3.0.0
354+
package-b<=1.0.0
355+
package-b>=3.0.0
356356
357357
And because you require one of:
358358
package-a<2.0.0
359359
package-a>2.0.0
360360
and package-b>=2.0.0,<3.0.0, we can conclude that your requirements are unsatisfiable.
361-
"#);
361+
"###);
362362

363363
// Only `a==1.2.0` is available since `a==1.0.0` and `a==3.0.0` require
364364
// incompatible versions of `b`. The user has excluded that version of `a` so
@@ -1167,16 +1167,16 @@ fn transitive_incompatible_with_root_version() {
11671167
uv_snapshot!(filters, command(&context)
11681168
.arg("transitive-incompatible-with-root-version-a")
11691169
.arg("transitive-incompatible-with-root-version-b==1.0.0")
1170-
, @r#"
1170+
, @r###"
11711171
success: false
11721172
exit_code: 1
11731173
----- stdout -----
11741174
11751175
----- stderr -----
11761176
× No solution found when resolving dependencies:
1177-
╰─▶ Because package-a==1.0.0 depends on package-b==2.0.0 and only package-a==1.0.0 is available, we can conclude that all versions of package-a depend on package-b==2.0.0.
1177+
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 depends on package-b==2.0.0, we can conclude that all versions of package-a depend on package-b==2.0.0.
11781178
And because you require package-a and package-b==1.0.0, we can conclude that your requirements are unsatisfiable.
1179-
"#);
1179+
"###);
11801180

11811181
assert_not_installed(
11821182
&context.venv,
@@ -1556,16 +1556,16 @@ fn local_transitive_greater_than() {
15561556
uv_snapshot!(filters, command(&context)
15571557
.arg("local-transitive-greater-than-a")
15581558
.arg("local-transitive-greater-than-b==2.0.0+foo")
1559-
, @r#"
1559+
, @r###"
15601560
success: false
15611561
exit_code: 1
15621562
----- stdout -----
15631563
15641564
----- stderr -----
15651565
× No solution found when resolving dependencies:
1566-
╰─▶ Because package-a==1.0.0 depends on package-b>2.0.0 and only package-a==1.0.0 is available, we can conclude that all versions of package-a depend on package-b>2.0.0.
1566+
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 depends on package-b>2.0.0, we can conclude that all versions of package-a depend on package-b>2.0.0.
15671567
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
1568-
"#);
1568+
"###);
15691569

15701570
assert_not_installed(
15711571
&context.venv,
@@ -1667,16 +1667,16 @@ fn local_transitive_less_than() {
16671667
uv_snapshot!(filters, command(&context)
16681668
.arg("local-transitive-less-than-a")
16691669
.arg("local-transitive-less-than-b==2.0.0+foo")
1670-
, @r#"
1670+
, @r###"
16711671
success: false
16721672
exit_code: 1
16731673
----- stdout -----
16741674
16751675
----- stderr -----
16761676
× No solution found when resolving dependencies:
1677-
╰─▶ Because package-a==1.0.0 depends on package-b<2.0.0 and only package-a==1.0.0 is available, we can conclude that all versions of package-a depend on package-b<2.0.0.
1677+
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 depends on package-b<2.0.0, we can conclude that all versions of package-a depend on package-b<2.0.0.
16781678
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
1679-
"#);
1679+
"###);
16801680

16811681
assert_not_installed(
16821682
&context.venv,
@@ -1826,16 +1826,16 @@ fn local_transitive_conflicting() {
18261826
uv_snapshot!(filters, command(&context)
18271827
.arg("local-transitive-conflicting-a")
18281828
.arg("local-transitive-conflicting-b==2.0.0+foo")
1829-
, @r#"
1829+
, @r###"
18301830
success: false
18311831
exit_code: 1
18321832
----- stdout -----
18331833
18341834
----- stderr -----
18351835
× No solution found when resolving dependencies:
1836-
╰─▶ Because package-a==1.0.0 depends on package-b==2.0.0+bar and only package-a==1.0.0 is available, we can conclude that all versions of package-a depend on package-b==2.0.0+bar.
1836+
╰─▶ Because only package-a==1.0.0 is available and package-a==1.0.0 depends on package-b==2.0.0+bar, we can conclude that all versions of package-a depend on package-b==2.0.0+bar.
18371837
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
1838-
"#);
1838+
"###);
18391839

18401840
assert_not_installed(
18411841
&context.venv,

0 commit comments

Comments
 (0)