From f682c9b37497be37e0f8df21322ab7a6c6b1a63f Mon Sep 17 00:00:00 2001 From: Aria Desires Date: Wed, 12 Feb 2025 12:53:30 -0500 Subject: [PATCH] regenerate snapshots --- ...s__missing_dependency_version_dynamic.snap | 9 ++- crates/uv/tests/it/edit.rs | 15 ++-- crates/uv/tests/it/lock.rs | 8 +++ crates/uv/tests/it/lock_conflict.rs | 5 +- crates/uv/tests/it/sync.rs | 68 +++++++++---------- 5 files changed, 60 insertions(+), 45 deletions(-) diff --git a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap index 8a0726607b62..52e8eba943af 100644 --- a/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap +++ b/crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap @@ -54,7 +54,8 @@ Ok( optional_dependencies: {}, dependency_groups: {}, metadata: PackageMetadata { - requires_dist: {}, + requires_dist: None, + provides_extras: None, dependency_groups: {}, }, }, @@ -100,7 +101,8 @@ Ok( optional_dependencies: {}, dependency_groups: {}, metadata: PackageMetadata { - requires_dist: {}, + requires_dist: None, + provides_extras: None, dependency_groups: {}, }, }, @@ -163,7 +165,8 @@ Ok( optional_dependencies: {}, dependency_groups: {}, metadata: PackageMetadata { - requires_dist: {}, + requires_dist: None, + provides_extras: None, dependency_groups: {}, }, }, diff --git a/crates/uv/tests/it/edit.rs b/crates/uv/tests/it/edit.rs index 20a44293fc21..45e7d6381606 100644 --- a/crates/uv/tests/it/edit.rs +++ b/crates/uv/tests/it/edit.rs @@ -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" @@ -9505,8 +9505,9 @@ fn repeated_index_cli_environment_variable() -> Result<()> { ] [package.metadata] + provides-extras = [] requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }] - "### + "# ); }); @@ -9589,7 +9590,7 @@ fn repeated_index_cli() -> Result<()> { filters => context.filters(), }, { assert_snapshot!( - lock, @r###" + lock, @r#" version = 1 requires-python = ">=3.12" @@ -9614,8 +9615,9 @@ fn repeated_index_cli() -> Result<()> { ] [package.metadata] + provides-extras = [] requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }] - "### + "# ); }); @@ -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" @@ -9723,8 +9725,9 @@ fn repeated_index_cli_reversed() -> Result<()> { ] [package.metadata] + provides-extras = [] requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }] - "### + "# ); }); diff --git a/crates/uv/tests/it/lock.rs b/crates/uv/tests/it/lock.rs index 19a4bdedef66..8270a9424f34 100644 --- a/crates/uv/tests/it/lock.rs +++ b/crates/uv/tests/it/lock.rs @@ -20071,6 +20071,10 @@ fn lock_dynamic_version_dependencies() -> Result<()> { [[package]] name = "project" source = { editable = "." } + + [package.metadata] + provides-extras = [] + requires-dist = [] "### ); }); @@ -20109,6 +20113,10 @@ fn lock_dynamic_version_dependencies() -> Result<()> { [[package]] name = "project" source = { editable = "." } + + [package.metadata] + provides-extras = [] + requires-dist = [] "### ); }); diff --git a/crates/uv/tests/it/lock_conflict.rs b/crates/uv/tests/it/lock_conflict.rs index 5124e011939d..606716cc3a57 100644 --- a/crates/uv/tests/it/lock_conflict.rs +++ b/crates/uv/tests/it/lock_conflict.rs @@ -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 = [ @@ -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" }, @@ -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 }, ] - "### + "# ); }); diff --git a/crates/uv/tests/it/sync.rs b/crates/uv/tests/it/sync.rs index 56d165f1551e..a99cd3dee87e 100644 --- a/crates/uv/tests/it/sync.rs +++ b/crates/uv/tests/it/sync.rs @@ -7106,25 +7106,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::>(); - 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()); @@ -7143,18 +7143,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#" @@ -7170,13 +7170,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] @@ -7186,28 +7186,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(()) } @@ -7233,8 +7233,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::>(); @@ -7298,20 +7298,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#" @@ -7328,29 +7328,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"); @@ -7429,24 +7429,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] @@ -7456,7 +7456,7 @@ fn sync_locked_script() -> Result<()> { + iniconfig==2.0.0 + sniffio==1.3.1 + typing-extensions==4.10.0 - "###); + "); Ok(()) }