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

Fix display of requirements on the development package

Browse source
This commit is contained in:
Zanie Blue 2024-08-15 16:18:03 -05:00
parent 58103851ab
commit 94d8020b58
2 changed files with 26 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

29
crates/uv-resolver/src/pubgrub/package.rs
View file

@ -196,13 +196,13 @@ impl std::fmt::Display for PubGrubPackageInner {
name,
extra: None,
marker: None,
..
dev: None,
} => write!(f, "{name}"),
Self::Package {
name,
extra: Some(extra),
marker: None,
..
dev: None,
} => {
write!(f, "{name}[{extra}]")
}
@ -210,19 +210,40 @@ impl std::fmt::Display for PubGrubPackageInner {
name,
extra: None,
marker: Some(marker),
..
dev: None,
} => write!(f, "{name}{{{marker}}}"),
Self::Package {
name,
extra: Some(extra),
marker: Some(marker),
..
dev: None,
} => {
write!(f, "{name}[{extra}]{{{marker}}}")
}
Self::Package {
name,
extra: None,
marker: None,
dev: Some(dev),
} => write!(f, "{name}:{dev}"),
Self::Package {
name,
extra: None,
marker: Some(marker),
dev: Some(dev),
} => {
write!(f, "{name}[{dev}]{{{marker}}}")
}
Self::Marker { name, marker, .. } => write!(f, "{name}{{{marker}}}"),
Self::Extra { name, extra, .. } => write!(f, "{name}[{extra}]"),
Self::Dev { name, dev, .. } => write!(f, "{name}:{dev}"),
// It is guaranteed that `extra` and `dev` are never set at the same time.
Self::Package {
name: _,
extra: Some(_),
marker: _,
dev: Some(_),
} => unreachable!(),
}
}
}

2
crates/uv/tests/workspace.rs
View file

@ -1439,7 +1439,7 @@ fn workspace_unsatisfiable_member_dependencies_conflicting_dev() -> Result<()> {
----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
× No solution found when resolving dependencies:
╰─▶ Because bar depends on bar:dev and bar depends on anyio==4.2.0, we can conclude that bar depends on anyio==4.2.0.
╰─▶ Because bar depends on bar:dev and bar:dev depends on anyio==4.2.0, we can conclude that bar depends on anyio==4.2.0.
And because foo depends on anyio==4.1.0, we can conclude that bar and foo are incompatible.
And because your workspace requires bar and foo, we can conclude that your workspace's requirements are unsatisfiable.
"###