Skip to content

Commit

Permalink
uv/tests: update resolution-markers in conflict test
Browse files Browse the repository at this point in the history
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.)
  • Loading branch information
BurntSushi committed Nov 23, 2024
1 parent 2ff4e4a commit 89c3d71
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions crates/uv/tests/it/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down

0 comments on commit 89c3d71

Please sign in to comment.