From ac5cee012803911ed9a00dd2a6547eebe731f960 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Fri, 22 Nov 2024 17:07:55 -0500 Subject: [PATCH] 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.) --- crates/uv/tests/it/lock.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/crates/uv/tests/it/lock.rs b/crates/uv/tests/it/lock.rs index 03a5c67fe..676c5c77a 100644 --- a/crates/uv/tests/it/lock.rs +++ b/crates/uv/tests/it/lock.rs @@ -19621,8 +19621,6 @@ fn lock_multiple_sources_index_disjoint_extras_with_marker() -> Result<()> { version = "3.1.3" source = { registry = "https://download.pytorch.org/whl/cu124" } resolution-markers = [ - "sys_platform == 'darwin'", - "sys_platform != 'darwin'", ] dependencies = [ { name = "markupsafe" },