mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-02 18:12:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Store dependency groups separate from dependencies in lockfile (#10148)

Browse source 
## Summary

This is necessary for some future improvements to non-`[project]`
workspaces and PEP 723 scripts. It's not "breaking", but it will
invalidate lockfiles for non-`[project]` workspaces. I think that's
okay, since we consider those legacy right now, and they're really rare.
This commit is contained in:
Charlie Marsh 2024-12-24 17:32:29 -05:00 • committed by GitHub
parent 3435777e87
commit e09b1080f4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 346 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/uv-workspace/src/workspace.rs
View file

@ -386,13 +386,24 @@ impl Workspace {
/// Returns any requirements that are exclusive to the workspace root, i.e., not included in
/// any of the workspace members.
///
/// For workspaces with non-project roots, returns the dev dependencies in the corresponding
/// `pyproject.toml`.
/// For now, there are no such requirements.
pub fn requirements(&self) -> Vec<uv_pep508::Requirement<VerbatimParsedUrl>> {
Vec::new()
}
/// Returns any dependency groups that are exclusive to the workspace root, i.e., not included
/// in any of the workspace members.
///
/// For workspaces with non-`[project]` roots, returns the dependency groups defined in the
/// corresponding `pyproject.toml`.
///
/// Otherwise, returns an empty list.
pub fn non_project_requirements(
pub fn dependency_groups(
&self,
) -> Result<Vec<uv_pep508::Requirement<VerbatimParsedUrl>>, DependencyGroupError> {
) -> Result<
BTreeMap<GroupName, Vec<uv_pep508::Requirement<VerbatimParsedUrl>>>,
DependencyGroupError,
> {
if self
.packages
.values()
@ -400,7 +411,7 @@ impl Workspace {
{
// If the workspace has an explicit root, the root is a member, so we don't need to
// include any root-only requirements.
Ok(Vec::new())
Ok(BTreeMap::default())
} else {
// Otherwise, return the dependency groups in the non-project workspace root.
// First, collect `tool.uv.dev_dependencies`
@ -419,19 +430,20 @@ impl Workspace {
.flatten()
.collect::<BTreeMap<_, _>>();
// Resolve any `include-group` entries in `dependency-groups`.
let dependency_groups =
// Flatten the dependency groups.
let mut dependency_groups =
FlatDependencyGroups::from_dependency_groups(&dependency_groups)
.map_err(|err| err.with_dev_dependencies(dev_dependencies))?;
// Concatenate the two sets of requirements.
let dev_dependencies = dependency_groups
.into_iter()
.flat_map(|(_, requirements)| requirements)
.chain(dev_dependencies.into_iter().flatten().cloned())
.collect();
// Add the `dev` group, if `dev-dependencies` is defined.
if let Some(dev_dependencies) = dev_dependencies {
dependency_groups
.entry(DEV_DEPENDENCIES.clone())
.or_insert_with(Vec::new)
.extend(dev_dependencies.clone());
}
Ok(dev_dependencies)
Ok(dependency_groups.into_inner())
}
}