Skip to content

Commit

Permalink
regenerate snapshots
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gankra @zanieb
Gankra authored and zanieb committed Feb 13, 2025
1 parent f8e272b commit 438f10b
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 45 deletions.
9 changes: 6 additions & 3 deletions ...lver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down Expand Up @@ -100,7 +101,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down Expand Up @@ -163,7 +165,8 @@ Ok(
optional_dependencies: {},
dependency_groups: {},
metadata: PackageMetadata {
requires_dist: {},
requires_dist: None,
provides_extras: None,
dependency_groups: {},
},
},
Expand Down
15 changes: 9 additions & 6 deletions crates/uv/tests/it/edit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9480,7 +9480,7 @@ fn repeated_index_cli_environment_variable() -> Result<()> {
filters => context.filters(),
}, {
assert_snapshot!(
lock, @r###"
lock, @r#"
version = 1
requires-python = ">=3.12"
Expand All @@ -9505,8 +9505,9 @@ fn repeated_index_cli_environment_variable() -> Result<()> {
]
[package.metadata]
provides-extras = []
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
"###
"#
);
});

Expand Down Expand Up @@ -9589,7 +9590,7 @@ fn repeated_index_cli() -> Result<()> {
filters => context.filters(),
}, {
assert_snapshot!(
lock, @r###"
lock, @r#"
version = 1
requires-python = ">=3.12"
Expand All @@ -9614,8 +9615,9 @@ fn repeated_index_cli() -> Result<()> {
]
[package.metadata]
provides-extras = []
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
"###
"#
);
});

Expand Down Expand Up @@ -9698,7 +9700,7 @@ fn repeated_index_cli_reversed() -> Result<()> {
filters => context.filters(),
}, {
assert_snapshot!(
lock, @r###"
lock, @r#"
version = 1
requires-python = ">=3.12"
Expand All @@ -9723,8 +9725,9 @@ fn repeated_index_cli_reversed() -> Result<()> {
]
[package.metadata]
provides-extras = []
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
"###
"#
);
});

Expand Down
5 changes: 3 additions & 2 deletions crates/uv/tests/it/lock_conflict.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7392,7 +7392,7 @@ fn incorrect_extra_simplification_leads_to_multiple_torch_packages() -> Result<(
}, {
assert_snapshot!(
lock,
@r###"
@r#"
version = 1
requires-python = ">=3.10"
resolution-markers = [
Expand Down Expand Up @@ -9734,6 +9734,7 @@ fn incorrect_extra_simplification_leads_to_multiple_torch_packages() -> Result<(
]

[package.metadata]
provides-extras = ["chgnet", "m3gnet"]
requires-dist = [
{ name = "chgnet", marker = "extra == 'chgnet'", specifier = "==0.4.0" },
{ name = "mace-torch", specifier = "==0.3.9" },
Expand Down Expand Up @@ -10067,7 +10068,7 @@ fn incorrect_extra_simplification_leads_to_multiple_torch_packages() -> Result<(
{ url = "https://files.pythonhosted.org/packages/f5/d5/688db678e987c3e0fb17867970700b92603cadf36c56e5fb08f23e822a0c/yarl-1.18.3-cp313-cp313-win_amd64.whl", hash = "sha256:578e281c393af575879990861823ef19d66e2b1d0098414855dd367e234f5b3c", size = 315723 },
{ url = "https://files.pythonhosted.org/packages/f5/4b/a06e0ec3d155924f77835ed2d167ebd3b211a7b0853da1cf8d8414d784ef/yarl-1.18.3-py3-none-any.whl", hash = "sha256:b57f4f58099328dfb26c6a771d09fb20dbbae81d20cfb66141251ea063bd101b", size = 45109 },
]
"###
"#
);
});

Expand Down
68 changes: 34 additions & 34 deletions crates/uv/tests/it/sync.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7002,25 +7002,25 @@ fn sync_script() -> Result<()> {
.filters()
.into_iter()
.chain(vec![(
r"environments-v1/script-\w+",
"environments-v1/script-[HASH]",
r"environments-v2/script-\w+",
"environments-v2/script-[HASH]",
)])
.collect::<Vec<_>>();

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Creating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Creating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 3 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 3 packages in [TIME]
+ anyio==4.3.0
+ idna==3.6
+ sniffio==1.3.1
"###);
");

// If a lockfile didn't exist already, `uv sync --script` shouldn't create one.
assert!(!context.temp_dir.child("uv.lock").exists());
Expand All @@ -7039,18 +7039,18 @@ fn sync_script() -> Result<()> {
"#
})?;

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 4 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
");

// Modify the `requires-python`.
script.write_str(indoc! { r#"
Expand All @@ -7066,13 +7066,13 @@ fn sync_script() -> Result<()> {
"#
})?;

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Recreating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Recreating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 6 packages in [TIME]
Prepared 2 packages in [TIME]
Installed 6 packages in [TIME]
Expand All @@ -7082,28 +7082,28 @@ fn sync_script() -> Result<()> {
+ iniconfig==2.0.0
+ sniffio==1.3.1
+ typing-extensions==4.10.0
"###);
");

// `--locked` and `--frozen` should fail with helpful error messages.
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r"
success: false
exit_code: 2
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
error: `uv sync --locked` requires a script lockfile; run `uv lock --script script.py` to lock the script
"###);
");

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--frozen"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--frozen"), @r"
success: false
exit_code: 2
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
error: `uv sync --frozen` requires a script lockfile; run `uv lock --script script.py` to lock the script
"###);
");

Ok(())
}
Expand All @@ -7129,8 +7129,8 @@ fn sync_locked_script() -> Result<()> {
.filters()
.into_iter()
.chain(vec![(
r"environments-v1/script-\w+",
"environments-v1/script-[HASH]",
r"environments-v2/script-\w+",
"environments-v2/script-[HASH]",
)])
.collect::<Vec<_>>();

Expand Down Expand Up @@ -7194,20 +7194,20 @@ fn sync_locked_script() -> Result<()> {
);
});

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Creating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Creating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 3 packages in [TIME]
Prepared 3 packages in [TIME]
Installed 3 packages in [TIME]
+ anyio==4.3.0
+ idna==3.6
+ sniffio==1.3.1
"###);
");

// Modify the script's dependencies.
script.write_str(indoc! { r#"
Expand All @@ -7224,29 +7224,29 @@ fn sync_locked_script() -> Result<()> {
})?;

// Re-run with `--locked`.
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r"
success: false
exit_code: 2
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 4 packages in [TIME]
error: The lockfile at `uv.lock` needs to be updated, but `--locked` was provided. To update the lockfile, run `uv lock`.
"###);
");

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 4 packages in [TIME]
Prepared 1 package in [TIME]
Installed 1 package in [TIME]
+ iniconfig==2.0.0
"###);
");

let lock = context.read("script.py.lock");

Expand Down Expand Up @@ -7325,24 +7325,24 @@ fn sync_locked_script() -> Result<()> {
})?;

// Re-run with `--locked`.
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py").arg("--locked"), @r"
success: false
exit_code: 2
----- stdout -----
----- stderr -----
Recreating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Recreating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 6 packages in [TIME]
error: The lockfile at `uv.lock` needs to be updated, but `--locked` was provided. To update the lockfile, run `uv lock`.
"###);
");

uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
success: true
exit_code: 0
----- stdout -----
----- stderr -----
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
Resolved 6 packages in [TIME]
Prepared 2 packages in [TIME]
Installed 6 packages in [TIME]
Expand All @@ -7352,7 +7352,7 @@ fn sync_locked_script() -> Result<()> {
+ iniconfig==2.0.0
+ sniffio==1.3.1
+ typing-extensions==4.10.0
"###);
");

Ok(())
}

0 comments on commit 438f10b

Please sign in to comment.