mirror of
https://github.com/astral-sh/uv.git
synced 2025-08-04 10:58:28 +00:00
081f20c53e
With the change, we remove the special casing of workspace dependencies and resolve `tool.uv` for all git and directory distributions. This gives us support for non-editable workspace dependencies and path dependencies in other workspaces. It removes a lot of special casing around workspaces. These changes are the groundwork for supporting `tool.uv` with dynamic metadata. The basis for this change is moving `Requirement` from `distribution-types` to `pypi-types` and the lowering logic from `uv-requirements` to `uv-distribution`. This changes should be split out in separate PRs. I've included an example workspace `albatross-root-workspace2` where `bird-feeder` depends on `a` from another workspace `ab`. There's a bunch of failing tests and regressed error messages that still need fixing. It does fix the audited package count for the workspace tests.
109 lines
3.9 KiB
Rust
109 lines
3.9 KiB
Rust
use pypi_types::RequirementSource;
|
|
use rustc_hash::FxHashSet;
|
|
|
|
use pep508_rs::MarkerEnvironment;
|
|
use uv_normalize::PackageName;
|
|
|
|
use crate::{DependencyMode, Manifest};
|
|
|
|
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, serde::Deserialize)]
|
|
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
|
|
#[cfg_attr(feature = "clap", derive(clap::ValueEnum))]
|
|
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
|
|
pub enum PreReleaseMode {
|
|
/// Disallow all pre-release versions.
|
|
Disallow,
|
|
|
|
/// Allow all pre-release versions.
|
|
Allow,
|
|
|
|
/// Allow pre-release versions if all versions of a package are pre-release.
|
|
IfNecessary,
|
|
|
|
/// Allow pre-release versions for first-party packages with explicit pre-release markers in
|
|
/// their version requirements.
|
|
Explicit,
|
|
|
|
/// Allow pre-release versions if all versions of a package are pre-release, or if the package
|
|
/// has an explicit pre-release marker in its version requirements.
|
|
#[default]
|
|
IfNecessaryOrExplicit,
|
|
}
|
|
|
|
/// Like [`PreReleaseMode`], but with any additional information required to select a candidate,
|
|
/// like the set of direct dependencies.
|
|
#[derive(Debug, Clone)]
|
|
pub(crate) enum PreReleaseStrategy {
|
|
/// Disallow all pre-release versions.
|
|
Disallow,
|
|
|
|
/// Allow all pre-release versions.
|
|
Allow,
|
|
|
|
/// Allow pre-release versions if all versions of a package are pre-release.
|
|
IfNecessary,
|
|
|
|
/// Allow pre-release versions for first-party packages with explicit pre-release markers in
|
|
/// their version requirements.
|
|
Explicit(FxHashSet<PackageName>),
|
|
|
|
/// Allow pre-release versions if all versions of a package are pre-release, or if the package
|
|
/// has an explicit pre-release marker in its version requirements.
|
|
IfNecessaryOrExplicit(FxHashSet<PackageName>),
|
|
}
|
|
|
|
impl PreReleaseStrategy {
|
|
pub(crate) fn from_mode(
|
|
mode: PreReleaseMode,
|
|
manifest: &Manifest,
|
|
markers: Option<&MarkerEnvironment>,
|
|
dependencies: DependencyMode,
|
|
) -> Self {
|
|
match mode {
|
|
PreReleaseMode::Disallow => Self::Disallow,
|
|
PreReleaseMode::Allow => Self::Allow,
|
|
PreReleaseMode::IfNecessary => Self::IfNecessary,
|
|
PreReleaseMode::Explicit => Self::Explicit(
|
|
manifest
|
|
.requirements(markers, dependencies)
|
|
.filter(|requirement| {
|
|
let RequirementSource::Registry { specifier, .. } = &requirement.source
|
|
else {
|
|
return false;
|
|
};
|
|
specifier
|
|
.iter()
|
|
.any(pep440_rs::VersionSpecifier::any_prerelease)
|
|
})
|
|
.map(|requirement| requirement.name.clone())
|
|
.collect(),
|
|
),
|
|
PreReleaseMode::IfNecessaryOrExplicit => Self::IfNecessaryOrExplicit(
|
|
manifest
|
|
.requirements(markers, dependencies)
|
|
.filter(|requirement| {
|
|
let RequirementSource::Registry { specifier, .. } = &requirement.source
|
|
else {
|
|
return false;
|
|
};
|
|
specifier
|
|
.iter()
|
|
.any(pep440_rs::VersionSpecifier::any_prerelease)
|
|
})
|
|
.map(|requirement| requirement.name.clone())
|
|
.collect(),
|
|
),
|
|
}
|
|
}
|
|
|
|
/// Returns `true` if a [`PackageName`] is allowed to have pre-release versions.
|
|
pub(crate) fn allows(&self, package: &PackageName) -> bool {
|
|
match self {
|
|
Self::Disallow => false,
|
|
Self::Allow => true,
|
|
Self::IfNecessary => false,
|
|
Self::Explicit(packages) => packages.contains(package),
|
|
Self::IfNecessaryOrExplicit(packages) => packages.contains(package),
|
|
}
|
|
}
|
|
}
|