Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion crates/uv-distribution-types/src/installed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ use uv_pypi_types::{DirectUrl, MetadataError};
use uv_redacted::DisplaySafeUrl;

use crate::{
BuildInfo, DistributionMetadata, InstalledMetadata, InstalledVersion, Name, VersionOrUrlRef,
BuildInfo, DistributionMetadata, InstalledMetadata, InstalledVersion, Name, VariantsJson,
VersionOrUrlRef,
};

#[derive(Error, Debug)]
Expand Down Expand Up @@ -484,6 +485,19 @@ impl InstalledDist {
}
}

/// Read the `variant.json` file of the distribution, if it exists.
pub fn read_variant_json(&self) -> Result<Option<VariantsJson>, InstalledDistError> {
let path = self.install_path().join("variant.json");
let file = match fs_err::File::open(&path) {
Ok(file) => file,
Err(err) if err.kind() == std::io::ErrorKind::NotFound => return Ok(None),
Err(err) => return Err(err.into()),
};
let variants_json =
serde_json::from_reader::<BufReader<fs_err::File>, VariantsJson>(BufReader::new(file))?;
Ok(Some(variants_json))
}

/// Return the supported wheel tags for the distribution from the `WHEEL` file, if available.
pub fn read_tags(&self) -> Result<Option<&ExpandedTags>, InstalledDistError> {
if let Some(tags) = self.tags_cache.get() {
Expand Down
26 changes: 23 additions & 3 deletions crates/uv-distribution-types/src/variant_json.rs
Original file line number Diff line number Diff line change
@@ -1,18 +1,38 @@
use rustc_hash::FxHashMap;
use std::{fmt::Display, str::FromStr};
use uv_normalize::{InvalidNameError, PackageName};
use uv_pep440::{Version, VersionParseError};

#[derive(Debug, thiserror::Error)]
pub enum VariantsJsonError {
#[error("Invalid variants.json filename")]
#[error("Invalid `variants.json` filename")]
InvalidFilename,
#[error("Invalid variants.json package name: {0}")]
#[error("Invalid `variants.json` package name: {0}")]
InvalidName(#[from] InvalidNameError),
#[error("Invalid variants.json version: {0}")]
#[error("Invalid `variants.json` version: {0}")]
InvalidVersion(#[from] VersionParseError),
}

/// A `<name>-<version>-variants.json` file.
#[derive(Debug, Clone, serde::Deserialize)]
pub struct VariantsJson {
variants: FxHashMap<String, serde_json::Value>,
}

impl VariantsJson {
/// Returns the label for the current variant.
pub fn label(&self) -> Option<&str> {
let mut keys = self.variants.keys();
let label = keys.next()?;
if keys.next().is_some() {
None
} else {
Some(label)
}
}
}

/// A `<name>-<version>-variants.json` filename.
#[derive(
Debug,
Clone,
Expand Down
32 changes: 32 additions & 0 deletions crates/uv/src/commands/pip/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ use uv_configuration::{Concurrency, IndexStrategy, KeyringProviderType};
use uv_distribution_filename::DistFilename;
use uv_distribution_types::{
Diagnostic, IndexCapabilities, IndexLocations, InstalledDist, Name, RequiresPython,
VariantsJson,
};
use uv_fs::Simplified;
use uv_installer::SitePackages;
Expand Down Expand Up @@ -166,6 +167,13 @@ pub(crate) async fn pip_list(
.map(|dist| Entry {
name: dist.name().clone(),
version: dist.version().clone(),
variant: dist
.read_variant_json()
.ok()
.flatten()
.as_ref()
.and_then(VariantsJson::label)
.map(ToString::to_string),
latest_version: latest
.get(dist.name())
.and_then(|filename| filename.as_ref())
Expand Down Expand Up @@ -204,6 +212,28 @@ pub(crate) async fn pip_list(
},
];

// Variant column is only displayed if at least one package has a variant.
let variants = results
.iter()
.map(|dist| {
dist.read_variant_json()
.ok()
.flatten()
.as_ref()
.and_then(VariantsJson::label)
.map(ToString::to_string)
})
.collect_vec();
if variants.iter().any(Option::is_some) {
columns.push(Column {
header: String::from("Variant"),
rows: variants
.into_iter()
.map(std::option::Option::unwrap_or_default)
.collect_vec(),
});
}

// The latest version and type are only displayed if outdated.
if outdated {
columns.push(Column {
Expand Down Expand Up @@ -330,6 +360,8 @@ struct Entry {
name: PackageName,
version: Version,
#[serde(skip_serializing_if = "Option::is_none")]
variant: Option<String>,
#[serde(skip_serializing_if = "Option::is_none")]
latest_version: Option<Version>,
#[serde(skip_serializing_if = "Option::is_none")]
latest_filetype: Option<FileType>,
Expand Down
Loading