Avatar for the astral-sh user
astral-sh
uv
Instrumentation
Wall Time
BlogDocsChangelog

add support for package level conflicts with groups

#9130Closed
Comparing
ag/package-level-conflict
(
a5ce1df
) with
main
(
7e78f54
)
CodSpeed Performance Gauge
0%
Untouched
3

Benchmarks

Passed

resolve_warm_airflow
crates/uv-bench/benches/uv.rs::uv::resolve_warm_airflow::resolve_warm_airflow
CodSpeed Performance Gauge
+1%
689.8 ms681.1 ms
resolve_warm_jupyter
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter::resolve_warm_jupyter
CodSpeed Performance Gauge
0%
66.7 ms67 ms
resolve_warm_jupyter_universal
crates/uv-bench/benches/uv.rs::uv::resolve_warm_jupyter_universal::resolve_warm_jupyter_universal
CodSpeed Performance Gauge
-2%
196.5 ms200.8 ms

Commits

Click on a commit to change the comparison range
Base
main
7e78f54
-1.02%
uv-resolver: support project-level conflicts Supporting project level conflicts ends up being pretty tricky, mostly because depenedency groups are represented as dependencies of the project you're trying to declare a conflict for. So by filtering out the project in the fork for the conflicting group, you end up filtering out the group itself too. To work-around this, we add a `parent` field to `PubGrubDependency`, and use this to filter based on project conflicts. This lets us do "delayed" filtering by one level. The rest of the changes in this commit are for reporting errors when you try to activate the group without disabling the project.
7fba6b5
10 months ago
by BurntSushi
+1.14%
Merge branch 'main' into ag/package-level-conflict
1370e51
2 months ago
by zanieb
-0.43%
Merge branch 'main' into ag/package-level-conflict
dd410d0
2 months ago
by zanieb
-1.5%
Fully support project level conflicts There was a fair bit of support for project level conflicts missing from `UniversalMarker`. I think that's because my initial PR pre-dated the beefing up of `UniversalMarker`.
6ca33c7
2 months ago
by BurntSushi
+2.91%
Do not include conflicts for packages that will not be installed
95b6b20
2 months ago
by zanieb
-0.55%
CLippy
a4eff02
2 months ago
by zanieb
-0.99%
Update comments
a5ce1df
2 months ago
by zanieb
© 2025 CodSpeed Technology
Home Terms Privacy Docs