mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-10-03 07:14:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Update PubGrub (#8245)

Browse source
This commit is contained in:
konsti 2024-10-16 17:39:23 +02:00 • committed by GitHub
parent 7730861bc5
commit 31bf8eb43b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2479,7 +2479,7 @@ dependencies = [
[[package]]
name = "pubgrub"
version = "0.2.1"
source = "git+https://github.com/astral-sh/pubgrub?rev=388685a8711092971930986644cfed152d1a1f6c#388685a8711092971930986644cfed152d1a1f6c"
source = "git+https://github.com/astral-sh/pubgrub?rev=19c77268c0ad5f69d7e12126e0cfacfbba466481#19c77268c0ad5f69d7e12126e0cfacfbba466481"
dependencies = [
"indexmap",
"log",

2
Cargo.toml
View file

@ -124,7 +124,7 @@ pathdiff = { version = "0.2.1" }
petgraph = { version = "0.6.5" }
platform-info = { version = "2.0.3" }
proc-macro2 = { version = "1.0.86" }
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "388685a8711092971930986644cfed152d1a1f6c" }
pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "19c77268c0ad5f69d7e12126e0cfacfbba466481" }
quote = { version = "1.0.37" }
rayon = { version = "1.10.0" }
reflink-copy = { version = "0.1.19" }

36
crates/uv/tests/it/pip_install_scenarios.rs
View file

@ -335,30 +335,30 @@ fn excluded_only_compatible_version() {
uv_snapshot!(filters, command(&context)
.arg("excluded-only-compatible-version-a!=2.0.0")
.arg("excluded-only-compatible-version-b<3.0.0,>=2.0.0")
, @r#"
, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ Because only the following versions of package-a are available:
╰─▶ Because package-a==1.0.0 depends on package-b==1.0.0 and only the following versions of package-a are available:
package-a==1.0.0
package-a==2.0.0
package-a==3.0.0
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.
we can conclude that package-a<2.0.0 depends on package-b==1.0.0.
And because package-a==3.0.0 depends on package-b==3.0.0, we can conclude that all of:
package-a<2.0.0
package-a>2.0.0
depend on one of:
package-b==1.0.0
package-b==3.0.0
package-b<=1.0.0
package-b>=3.0.0
And because you require one of:
package-a<2.0.0
package-a>2.0.0
and package-b>=2.0.0,<3.0.0, we can conclude that your requirements are unsatisfiable.
"#);
"###);
// Only `a==1.2.0` is available since `a==1.0.0` and `a==3.0.0` require
// incompatible versions of `b`. The user has excluded that version of `a` so
@ -1167,16 +1167,16 @@ fn transitive_incompatible_with_root_version() {
uv_snapshot!(filters, command(&context)
.arg("transitive-incompatible-with-root-version-a")
.arg("transitive-incompatible-with-root-version-b==1.0.0")
, @r#"
, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ 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.
╰─▶ 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.
And because you require package-a and package-b==1.0.0, we can conclude that your requirements are unsatisfiable.
"#);
"###);
assert_not_installed(
&context.venv,
@ -1556,16 +1556,16 @@ fn local_transitive_greater_than() {
uv_snapshot!(filters, command(&context)
.arg("local-transitive-greater-than-a")
.arg("local-transitive-greater-than-b==2.0.0+foo")
, @r#"
, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ 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.
╰─▶ 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.
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
"#);
"###);
assert_not_installed(
&context.venv,
@ -1667,16 +1667,16 @@ fn local_transitive_less_than() {
uv_snapshot!(filters, command(&context)
.arg("local-transitive-less-than-a")
.arg("local-transitive-less-than-b==2.0.0+foo")
, @r#"
, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ 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.
╰─▶ 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.
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
"#);
"###);
assert_not_installed(
&context.venv,
@ -1826,16 +1826,16 @@ fn local_transitive_conflicting() {
uv_snapshot!(filters, command(&context)
.arg("local-transitive-conflicting-a")
.arg("local-transitive-conflicting-b==2.0.0+foo")
, @r#"
, @r###"
success: false
exit_code: 1
----- stdout -----
----- stderr -----
× No solution found when resolving dependencies:
╰─▶ 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.
╰─▶ 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.
And because you require package-a and package-b==2.0.0+foo, we can conclude that your requirements are unsatisfiable.
"#);
"###);
assert_not_installed(
&context.venv,