35ded6d7e1
In #10875, I relaxed the error checking during resolution to permit dependencies like `foo[x1]`, where `x1` was defined to be conflicting. In exchange, the error was, roughly speaking, moved to installation time. This was achieved by looking at the full set of enabled extras and checking whether any conflicts occurred. If so, an error was reported. This ends up being more expressive and permits more valid configurations. However, in so doing, there was a bug in how the accumulated extras were being passed to conflict marker evaluation. Namely, we weren't accounting for the fact that if `foo[x1]` was enabled, then that fact should be carried through to all conflict marker evaluations. This is because some of those will use things like `extra != 'x1'` to indicate that it should only be included if an extra *isn't* enabled. In #10985, this manifested with PyTorch where `torch==2.4.1` and `torch==2.4.1+cpu` were being installed simultaneously. Namely, the choice to install `torch==2.4.1` was not taking into account that the `cpu` extra has been enabled. If it did, then it's conflict marker would evaluate to `false`. Since it didn't, and since `torch==2.4.1+cpu` was also being included, we ended up installing both versions. The approach I took in this PR was to add a second breadth first traversal (which comes first) over the dependency tree to accumulate all of the activated extras. Then, only in the second traversal do we actually build up the resolution graph. Unfortunately, I have no automatic regression test to include here. The regression test we _ought_ to include involves `torch`. And while we are generally find to use those in tests that only generate a lock file, the regression test here actually requires running installation. And downloading and installing `torch` in tests is bad juju. So adding a regression test for this is blocked on better infrastructure for PyTorch tests. With that said, I did manually verify that the test case in #10985 no longer installs multiple versions of `torch`. Fixes #10985
Crates
uv-bench
Functionality for benchmarking uv.
uv-cache-key
Generic functionality for caching paths, URLs, and other resources across platforms.
uv-distribution-filename
Parse built distribution (wheel) and source distribution (sdist) filenames to extract structured metadata.
uv-distribution-types
Abstractions for representing built distributions (wheels) and source distributions (sdists), and the sources from which they can be downloaded.
uv-install-wheel-rs
Install built distributions (wheels) into a virtual environment.
uv-once-map
A waitmap-like concurrent hash map for executing tasks
exactly once.
uv-pep440-rs
Utilities for interacting with Python version numbers and specifiers.
uv-pep508-rs
Utilities for parsing and evaluating dependency specifiers, previously known as PEP 508.
uv-platform-tags
Functionality for parsing and inferring Python platform tags as per PEP 425.
uv-cli
Command-line interface for the uv package manager.
uv-build-frontend
A PEP 517-compatible build frontend for uv.
uv-cache
Functionality for caching Python packages and associated metadata.
uv-client
Client for interacting with PyPI-compatible HTTP APIs.
uv-dev
Development utilities for uv.
uv-dispatch
A centralized struct for resolving and building source distributions in isolated environments.
Implements the traits defined in uv-types.
uv-distribution
Client for interacting with built distributions (wheels) and source distributions (sdists). Capable of fetching metadata, distribution contents, etc.
uv-extract
Utilities for extracting files from archives.
uv-fs
Utilities for interacting with the filesystem.
uv-git
Functionality for interacting with Git repositories.
uv-installer
Functionality for installing Python packages into a virtual environment.
uv-python
Functionality for detecting and leveraging the current Python interpreter.
uv-normalize
Normalize package and extra names as per Python specifications.
uv-requirements
Utilities for reading package requirements from pyproject.toml and requirements.txt files.
uv-resolver
Functionality for resolving Python packages and their dependencies.
uv-shell
Utilities for detecting and manipulating shell environments.
uv-types
Shared traits for uv, to avoid circular dependencies.
uv-pypi-types
General-purpose type definitions for types used in PyPI-compatible APIs.
uv-virtualenv
A venv replacement to create virtual environments in Rust.
uv-warnings
User-facing warnings for uv.
uv-workspace
Workspace abstractions for uv.
uv-requirements-txt
Functionality for parsing requirements.txt files.