Skip to content

Commit cc2dbe9

Browse files
committed
uv/tests: update resolution-markers in conflict test
This change is correct because disjointness checks now incorporate conflicts. In this case, there are actually four forks. Two of them correspond to `sys_platform == 'darwin'` and `sys_platform != 'darwin'`, but neither of those contain `jinja2==3.1.3`. Instead, they contain other versions of `jinja2` linked to other extras. If we ever add conflicts to our `resolution-markers` in the lock file, then those forks should show up here again. (Because, of course, some forks do contain `jinja2==3.1.3` here.)
1 parent 99f1f8f commit cc2dbe9

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

crates/uv/tests/it/lock.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19421,8 +19421,6 @@ fn lock_multiple_sources_index_disjoint_extras_with_marker() -> Result<()> {
1942119421
version = "3.1.3"
1942219422
source = { registry = "https://download.pytorch.org/whl/cu124" }
1942319423
resolution-markers = [
19424-
"sys_platform == 'darwin'",
19425-
"sys_platform != 'darwin'",
1942619424
]
1942719425
dependencies = [
1942819426
{ name = "markupsafe" },

0 commit comments

Comments
 (0)