Skip to content

Commit 1e58434

Browse files
GankraGankra
committed
regenerate snapshots
1 parent f7f3064 commit 1e58434

File tree

4 files changed

+52
-45
lines changed

4 files changed

+52
-45
lines changed

‎crates/uv-resolver/src/lock/snapshots/uv_resolver__lock__tests__missing_dependency_version_dynamic.snap‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ Ok(
5454
optional_dependencies: {},
5555
dependency_groups: {},
5656
metadata: PackageMetadata {
57-
requires_dist: {},
57+
requires_dist: None,
58+
provides_extras: None,
5859
dependency_groups: {},
5960
},
6061
},
@@ -100,7 +101,8 @@ Ok(
100101
optional_dependencies: {},
101102
dependency_groups: {},
102103
metadata: PackageMetadata {
103-
requires_dist: {},
104+
requires_dist: None,
105+
provides_extras: None,
104106
dependency_groups: {},
105107
},
106108
},
@@ -163,7 +165,8 @@ Ok(
163165
optional_dependencies: {},
164166
dependency_groups: {},
165167
metadata: PackageMetadata {
166-
requires_dist: {},
168+
requires_dist: None,
169+
provides_extras: None,
167170
dependency_groups: {},
168171
},
169172
},

‎crates/uv/tests/it/edit.rs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9480,7 +9480,7 @@ fn repeated_index_cli_environment_variable() -> Result<()> {
94809480
filters => context.filters(),
94819481
}, {
94829482
assert_snapshot!(
9483-
lock, @r###"
9483+
lock, @r#"
94849484
version = 1
94859485
requires-python = ">=3.12"
94869486
@@ -9505,8 +9505,9 @@ fn repeated_index_cli_environment_variable() -> Result<()> {
95059505
]
95069506
95079507
[package.metadata]
9508+
provides-extras = []
95089509
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
9509-
"###
9510+
"#
95109511
);
95119512
});
95129513

@@ -9589,7 +9590,7 @@ fn repeated_index_cli() -> Result<()> {
95899590
filters => context.filters(),
95909591
}, {
95919592
assert_snapshot!(
9592-
lock, @r###"
9593+
lock, @r#"
95939594
version = 1
95949595
requires-python = ">=3.12"
95959596
@@ -9614,8 +9615,9 @@ fn repeated_index_cli() -> Result<()> {
96149615
]
96159616
96169617
[package.metadata]
9618+
provides-extras = []
96179619
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
9618-
"###
9620+
"#
96199621
);
96209622
});
96219623

@@ -9698,7 +9700,7 @@ fn repeated_index_cli_reversed() -> Result<()> {
96989700
filters => context.filters(),
96999701
}, {
97009702
assert_snapshot!(
9701-
lock, @r###"
9703+
lock, @r#"
97029704
version = 1
97039705
requires-python = ">=3.12"
97049706
@@ -9723,8 +9725,9 @@ fn repeated_index_cli_reversed() -> Result<()> {
97239725
]
97249726
97259727
[package.metadata]
9728+
provides-extras = []
97269729
requires-dist = [{ name = "iniconfig", specifier = ">=2.0.0" }]
9727-
"###
9730+
"#
97289731
);
97299732
});
97309733

‎crates/uv/tests/it/lock_conflict.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7392,7 +7392,7 @@ fn incorrect_extra_simplification_leads_to_multiple_torch_packages() -> Result<(
73927392
}, {
73937393
assert_snapshot!(
73947394
lock,
7395-
@r###"
7395+
@r#"
73967396
version = 1
73977397
requires-python = ">=3.10"
73987398
resolution-markers = [
@@ -9734,6 +9734,7 @@ fn incorrect_extra_simplification_leads_to_multiple_torch_packages() -> Result<(
97349734
]
97359735

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

‎crates/uv/tests/it/sync.rs‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -7002,25 +7002,25 @@ fn sync_script() -> Result<()> {
70027002
.filters()
70037003
.into_iter()
70047004
.chain(vec![(
7005-
r"environments-v1/script-\w+",
7006-
"environments-v1/script-[HASH]",
7005+
r"environments-v2/script-\w+",
7006+
"environments-v2/script-[HASH]",
70077007
)])
70087008
.collect::<Vec<_>>();
70097009

7010-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7010+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
70117011
success: true
70127012
exit_code: 0
70137013
----- stdout -----
70147014
70157015
----- stderr -----
7016-
Creating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7016+
Creating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
70177017
Resolved 3 packages in [TIME]
70187018
Prepared 3 packages in [TIME]
70197019
Installed 3 packages in [TIME]
70207020
+ anyio==4.3.0
70217021
+ idna==3.6
70227022
+ sniffio==1.3.1
7023-
"###);
7023+
");
70247024

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

7042-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7042+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
70437043
success: true
70447044
exit_code: 0
70457045
----- stdout -----
70467046
70477047
----- stderr -----
7048-
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7048+
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
70497049
Resolved 4 packages in [TIME]
70507050
Prepared 1 package in [TIME]
70517051
Installed 1 package in [TIME]
70527052
+ iniconfig==2.0.0
7053-
"###);
7053+
");
70547054

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

7069-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7069+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
70707070
success: true
70717071
exit_code: 0
70727072
----- stdout -----
70737073
70747074
----- stderr -----
7075-
Recreating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7075+
Recreating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
70767076
Resolved 6 packages in [TIME]
70777077
Prepared 2 packages in [TIME]
70787078
Installed 6 packages in [TIME]
@@ -7082,28 +7082,28 @@ fn sync_script() -> Result<()> {
70827082
+ iniconfig==2.0.0
70837083
+ sniffio==1.3.1
70847084
+ typing-extensions==4.10.0
7085-
"###);
7085+
");
70867086

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

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

71087108
Ok(())
71097109
}
@@ -7129,8 +7129,8 @@ fn sync_locked_script() -> Result<()> {
71297129
.filters()
71307130
.into_iter()
71317131
.chain(vec![(
7132-
r"environments-v1/script-\w+",
7133-
"environments-v1/script-[HASH]",
7132+
r"environments-v2/script-\w+",
7133+
"environments-v2/script-[HASH]",
71347134
)])
71357135
.collect::<Vec<_>>();
71367136

@@ -7194,20 +7194,20 @@ fn sync_locked_script() -> Result<()> {
71947194
);
71957195
});
71967196

7197-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7197+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
71987198
success: true
71997199
exit_code: 0
72007200
----- stdout -----
72017201
72027202
----- stderr -----
7203-
Creating script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7203+
Creating script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
72047204
Resolved 3 packages in [TIME]
72057205
Prepared 3 packages in [TIME]
72067206
Installed 3 packages in [TIME]
72077207
+ anyio==4.3.0
72087208
+ idna==3.6
72097209
+ sniffio==1.3.1
7210-
"###);
7210+
");
72117211

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

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

7238-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7238+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
72397239
success: true
72407240
exit_code: 0
72417241
----- stdout -----
72427242
72437243
----- stderr -----
7244-
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7244+
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
72457245
Resolved 4 packages in [TIME]
72467246
Prepared 1 package in [TIME]
72477247
Installed 1 package in [TIME]
72487248
+ iniconfig==2.0.0
7249-
"###);
7249+
");
72507250

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

@@ -7325,24 +7325,24 @@ fn sync_locked_script() -> Result<()> {
73257325
})?;
73267326

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

7339-
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r###"
7339+
uv_snapshot!(&filters, context.sync().arg("--script").arg("script.py"), @r"
73407340
success: true
73417341
exit_code: 0
73427342
----- stdout -----
73437343
73447344
----- stderr -----
7345-
Using script environment at: [CACHE_DIR]/environments-v1/script-[HASH]
7345+
Using script environment at: [CACHE_DIR]/environments-v2/script-[HASH]
73467346
Resolved 6 packages in [TIME]
73477347
Prepared 2 packages in [TIME]
73487348
Installed 6 packages in [TIME]
@@ -7352,7 +7352,7 @@ fn sync_locked_script() -> Result<()> {
73527352
+ iniconfig==2.0.0
73537353
+ sniffio==1.3.1
73547354
+ typing-extensions==4.10.0
7355-
"###);
7355+
");
73567356

73577357
Ok(())
73587358
}

0 commit comments

Comments
 (0)