Max Mynter
2608f742b2
Closes: #4567 ## Summary When adding a package with Git reference options (`--rev`, `--tag`, `--branch`) that already has a Git source defined, use the existing Git URL with the new reference instead of reporting an error. This allows commands like `uv add requests --branch main` to work when requests is already defined with a Git source in the project configuration. Previously, you would need to provide the whole Git url again for this to work: ```bash uv add git+https://github.com/psf/requests --branch main ``` <!-- What's the purpose of the change? What does it do, and why? --> ## Test Plan - [x] Add unit tests for project - [x] Add unit tests for script - [x] Tested locally for project and script environments like below ### Testing Project In a directory using the `uv` executable from this PR (via replacing every `uv` with `cargo run --`) initialize a project and virtual environment ```bash uv init uv venv ``` move into the environment ```bash # on mac source .venv/bin/activate ``` and add a dependency with a git url ```bash uv add git+https://github.com/Textualize/rich --branch master ``` Then change the branch of the project to see that the branch can be changed without need of the whole git url: ```bash uv add rich --branch py310 ``` ### Testing Script Create the following file, e.g. `script.py`: ```python import time from rich.progress import track print("Starting") for i in track(range(20), description="For example:"): time.sleep(0.05) print("Done") ``` Now using `uv` (referencing the executable of this PR) add the dependency ```bash uv add --script script.py 'git+https://github.com/Textualize/rich' --branch master ``` and check we can execute the script: ```bash uv run script.py ``` To test the change update the branch ```bash uv add --script script.py rich --branch py310 ``` and check that the dependency is updated and the script is executed: ```bash uv run script.py ``` <!-- How was it tested? --> ---- This is my first time contributing to `uv` (yay, 🤗) so let me know if there is something obvious i am missing. Unit tests will follow soon. --------- Co-authored-by: Charlie Marsh <charlie.r.marsh@gmail.com>
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.