mirror of
https://github.com/astral-sh/uv.git
synced 2025-07-07 21:35:00 +00:00
Add PEX lock file export support
- Add ExportFormat::PexLock with format detection for
.pex.lock/.pex.json files
- Implement complete PEX lock file JSON schema with
proper serialization
- Use correct 3-component platform tags ['py', 'none',
'any'] for universal compatibility
- Support separate algorithm/hash fields in artifacts
(fixes PEX parser errors)
- Add robust error handling that skips invalid artifacts
- Include comprehensive metadata: pex_version, build
settings, requirements
- Support both wheels and source distributions with
proper URL handling
- Add module documentation and unit tests
Enables seamless integration with PEX packaging tools and
Pantsbuild workflows.
🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
parent
f609e1ddaf
commit
a7fbe5ae3b
10 changed files with 294 additions and 4 deletions
1
Cargo.lock
generated
1
Cargo.lock
generated
|
@ -5739,6 +5739,7 @@ dependencies = [
|
||||||
"same-file",
|
"same-file",
|
||||||
"schemars",
|
"schemars",
|
||||||
"serde",
|
"serde",
|
||||||
|
"serde_json",
|
||||||
"smallvec",
|
"smallvec",
|
||||||
"textwrap",
|
"textwrap",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
|
|
|
@ -15,4 +15,8 @@ pub enum ExportFormat {
|
||||||
#[serde(rename = "pylock.toml", alias = "pylock-toml")]
|
#[serde(rename = "pylock.toml", alias = "pylock-toml")]
|
||||||
#[cfg_attr(feature = "clap", clap(name = "pylock.toml", alias = "pylock-toml"))]
|
#[cfg_attr(feature = "clap", clap(name = "pylock.toml", alias = "pylock-toml"))]
|
||||||
PylockToml,
|
PylockToml,
|
||||||
|
/// Export in `pex.lock` format.
|
||||||
|
#[serde(rename = "pex.lock", alias = "pex-lock")]
|
||||||
|
#[cfg_attr(feature = "clap", clap(name = "pex.lock", alias = "pex-lock"))]
|
||||||
|
PexLock,
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,6 +59,7 @@ rustc-hash = { workspace = true }
|
||||||
same-file = { workspace = true }
|
same-file = { workspace = true }
|
||||||
schemars = { workspace = true, optional = true }
|
schemars = { workspace = true, optional = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
|
serde_json = { workspace = true }
|
||||||
smallvec = { workspace = true }
|
smallvec = { workspace = true }
|
||||||
textwrap = { workspace = true }
|
textwrap = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
|
|
|
@ -5,7 +5,7 @@ pub use exclusions::Exclusions;
|
||||||
pub use flat_index::{FlatDistributions, FlatIndex};
|
pub use flat_index::{FlatDistributions, FlatIndex};
|
||||||
pub use fork_strategy::ForkStrategy;
|
pub use fork_strategy::ForkStrategy;
|
||||||
pub use lock::{
|
pub use lock::{
|
||||||
Installable, Lock, LockError, LockVersion, Package, PackageMap, PylockToml,
|
Installable, Lock, LockError, LockVersion, Package, PackageMap, PexLock, PylockToml,
|
||||||
PylockTomlErrorKind, RequirementsTxtExport, ResolverManifest, SatisfiesResult, TreeDisplay,
|
PylockTomlErrorKind, RequirementsTxtExport, ResolverManifest, SatisfiesResult, TreeDisplay,
|
||||||
VERSION,
|
VERSION,
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,11 +19,13 @@ use crate::graph_ops::{Reachable, marker_reachability};
|
||||||
pub(crate) use crate::lock::export::pylock_toml::PylockTomlPackage;
|
pub(crate) use crate::lock::export::pylock_toml::PylockTomlPackage;
|
||||||
pub use crate::lock::export::pylock_toml::{PylockToml, PylockTomlErrorKind};
|
pub use crate::lock::export::pylock_toml::{PylockToml, PylockTomlErrorKind};
|
||||||
pub use crate::lock::export::requirements_txt::RequirementsTxtExport;
|
pub use crate::lock::export::requirements_txt::RequirementsTxtExport;
|
||||||
|
pub use crate::lock::export::pex_lock::PexLock;
|
||||||
use crate::universal_marker::resolve_conflicts;
|
use crate::universal_marker::resolve_conflicts;
|
||||||
use crate::{Installable, Package};
|
use crate::{Installable, Package};
|
||||||
|
|
||||||
mod pylock_toml;
|
mod pylock_toml;
|
||||||
mod requirements_txt;
|
mod requirements_txt;
|
||||||
|
mod pex_lock;
|
||||||
|
|
||||||
/// A flat requirement, with its associated marker.
|
/// A flat requirement, with its associated marker.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
|
|
254
crates/uv-resolver/src/lock/export/pex_lock.rs
Normal file
254
crates/uv-resolver/src/lock/export/pex_lock.rs
Normal file
|
@ -0,0 +1,254 @@
|
||||||
|
//! PEX lock file format support.
|
||||||
|
//!
|
||||||
|
//! This module provides functionality to export UV lock files to the PEX lock format,
|
||||||
|
//! which is used by the PEX packaging tool and Pantsbuild for reproducible Python builds.
|
||||||
|
//!
|
||||||
|
//! The PEX lock format is a JSON-based format that includes:
|
||||||
|
//! - Package metadata and version constraints
|
||||||
|
//! - Platform-specific resolves with 3-component platform tags
|
||||||
|
//! - Artifact information with separate algorithm and hash fields
|
||||||
|
//! - Build and resolution configuration
|
||||||
|
|
||||||
|
use std::fmt;
|
||||||
|
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use crate::lock::{Lock, LockError, WheelWireSource};
|
||||||
|
|
||||||
|
/// A PEX lock file representation.
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PexLock {
|
||||||
|
/// The PEX version used to generate this lock file.
|
||||||
|
pub pex_version: String,
|
||||||
|
/// Whether to allow building from source.
|
||||||
|
pub allow_builds: bool,
|
||||||
|
/// Whether to allow prereleases.
|
||||||
|
pub allow_prereleases: bool,
|
||||||
|
/// Whether to allow wheels.
|
||||||
|
pub allow_wheels: bool,
|
||||||
|
/// Whether to use build isolation.
|
||||||
|
pub build_isolation: bool,
|
||||||
|
/// Whether to prefer older binary versions.
|
||||||
|
pub prefer_older_binary: bool,
|
||||||
|
/// Whether to use PEP517 build backend.
|
||||||
|
pub use_pep517: Option<bool>,
|
||||||
|
/// The resolver version used.
|
||||||
|
pub resolver_version: String,
|
||||||
|
/// The style of resolution.
|
||||||
|
pub style: String,
|
||||||
|
/// Whether to include transitive dependencies.
|
||||||
|
pub transitive: bool,
|
||||||
|
/// Python version requirements.
|
||||||
|
pub requires_python: Vec<String>,
|
||||||
|
/// Direct requirements.
|
||||||
|
pub requirements: Vec<String>,
|
||||||
|
/// Constraints applied during resolution.
|
||||||
|
pub constraints: Vec<String>,
|
||||||
|
/// Locked resolved dependencies.
|
||||||
|
pub locked_resolves: Vec<PexLockedResolve>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A locked resolve entry in a PEX lock file.
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PexLockedResolve {
|
||||||
|
/// The platform tag this resolve applies to (3 components: [interpreter, abi, platform]).
|
||||||
|
pub platform_tag: Vec<String>,
|
||||||
|
/// The locked requirements for this platform.
|
||||||
|
pub locked_requirements: Vec<PexLockedRequirement>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A locked requirement in a PEX lock file.
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PexLockedRequirement {
|
||||||
|
/// The project name.
|
||||||
|
pub project_name: String,
|
||||||
|
/// The version.
|
||||||
|
pub version: String,
|
||||||
|
/// The requirement specifier.
|
||||||
|
pub requirement: String,
|
||||||
|
/// Artifacts (wheels/sdists) for this requirement.
|
||||||
|
pub artifacts: Vec<PexArtifact>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An artifact in a PEX lock file.
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct PexArtifact {
|
||||||
|
/// The artifact URL.
|
||||||
|
pub url: String,
|
||||||
|
/// The filename.
|
||||||
|
pub filename: String,
|
||||||
|
/// Hash algorithm (e.g., "sha256").
|
||||||
|
pub algorithm: String,
|
||||||
|
/// Hash value.
|
||||||
|
pub hash: String,
|
||||||
|
/// Whether this is a wheel.
|
||||||
|
pub is_wheel: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl PexLock {
|
||||||
|
/// Default PEX version for generated lock files.
|
||||||
|
const DEFAULT_PEX_VERSION: &'static str = "2.44.0";
|
||||||
|
|
||||||
|
/// Default hash algorithm when none is specified.
|
||||||
|
const DEFAULT_HASH_ALGORITHM: &'static str = "sha256";
|
||||||
|
|
||||||
|
/// Universal platform tag components: [interpreter, abi, platform].
|
||||||
|
const UNIVERSAL_PLATFORM_TAG: [&'static str; 3] = ["py", "none", "any"];
|
||||||
|
|
||||||
|
/// Extract algorithm and hash from a hash string.
|
||||||
|
fn parse_hash(hash_str: &str) -> (String, String) {
|
||||||
|
if let Some(colon_pos) = hash_str.find(':') {
|
||||||
|
let algorithm = hash_str[..colon_pos].to_string();
|
||||||
|
let hash_value = hash_str[colon_pos + 1..].to_string();
|
||||||
|
(algorithm, hash_value)
|
||||||
|
} else {
|
||||||
|
(Self::DEFAULT_HASH_ALGORITHM.to_string(), hash_str.to_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a new PEX lock from a UV lock file.
|
||||||
|
pub fn from_lock(lock: &Lock) -> Result<Self, LockError> {
|
||||||
|
let mut requirements = Vec::new();
|
||||||
|
let mut locked_requirements = Vec::new();
|
||||||
|
|
||||||
|
// Collect root requirements
|
||||||
|
if let Some(root) = lock.root() {
|
||||||
|
for dep in &root.dependencies {
|
||||||
|
if let Some(version) = lock.packages().iter()
|
||||||
|
.find(|pkg| pkg.id.name == dep.package_id.name)
|
||||||
|
.and_then(|pkg| pkg.id.version.as_ref())
|
||||||
|
{
|
||||||
|
requirements.push(format!("{}=={}", dep.package_id.name, version));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Process all packages for locked requirements
|
||||||
|
for package in lock.packages() {
|
||||||
|
|
||||||
|
// Create locked requirement
|
||||||
|
let mut artifacts = Vec::new();
|
||||||
|
|
||||||
|
// Add wheels
|
||||||
|
for wheel in &package.wheels {
|
||||||
|
let wheel_url = match &wheel.url {
|
||||||
|
WheelWireSource::Url { url } => url.to_string(),
|
||||||
|
WheelWireSource::Path { path } => format!("file://{}", path.to_string_lossy()),
|
||||||
|
WheelWireSource::Filename { filename } => filename.to_string(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let (algorithm, hash) = if let Some(h) = wheel.hash.as_ref() {
|
||||||
|
Self::parse_hash(&h.to_string())
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
artifacts.push(PexArtifact {
|
||||||
|
url: wheel_url,
|
||||||
|
filename: wheel.filename.to_string(),
|
||||||
|
algorithm,
|
||||||
|
hash,
|
||||||
|
is_wheel: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add source distributions
|
||||||
|
if let Some(sdist) = &package.sdist {
|
||||||
|
let Some(sdist_url) = sdist.url().map(|u| u.to_string()) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let Some(sdist_filename) = sdist.filename().map(|f| f.to_string()) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
let (algorithm, hash) = if let Some(h) = sdist.hash() {
|
||||||
|
Self::parse_hash(&h.to_string())
|
||||||
|
} else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
|
||||||
|
artifacts.push(PexArtifact {
|
||||||
|
url: sdist_url,
|
||||||
|
filename: sdist_filename,
|
||||||
|
algorithm,
|
||||||
|
hash,
|
||||||
|
is_wheel: false,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if let Some(version) = &package.id.version {
|
||||||
|
locked_requirements.push(PexLockedRequirement {
|
||||||
|
project_name: package.id.name.to_string(),
|
||||||
|
version: version.to_string(),
|
||||||
|
requirement: format!("{}=={}", package.id.name, version),
|
||||||
|
artifacts,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let locked_resolves = vec![PexLockedResolve {
|
||||||
|
platform_tag: Self::UNIVERSAL_PLATFORM_TAG.iter().map(|s| s.to_string()).collect(),
|
||||||
|
locked_requirements,
|
||||||
|
}];
|
||||||
|
|
||||||
|
Ok(PexLock {
|
||||||
|
pex_version: Self::DEFAULT_PEX_VERSION.to_string(),
|
||||||
|
allow_builds: true,
|
||||||
|
allow_prereleases: false,
|
||||||
|
allow_wheels: true,
|
||||||
|
build_isolation: true,
|
||||||
|
prefer_older_binary: false,
|
||||||
|
use_pep517: None,
|
||||||
|
resolver_version: Self::DEFAULT_PEX_VERSION.to_string(),
|
||||||
|
style: "universal".to_string(),
|
||||||
|
transitive: true,
|
||||||
|
requires_python: vec![lock.requires_python().to_string()],
|
||||||
|
requirements,
|
||||||
|
constraints: Vec::new(),
|
||||||
|
locked_resolves,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Serialize the PEX lock to JSON.
|
||||||
|
pub fn to_json(&self) -> Result<String, serde_json::Error> {
|
||||||
|
serde_json::to_string_pretty(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl fmt::Display for PexLock {
|
||||||
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||||
|
match self.to_json() {
|
||||||
|
Ok(json) => write!(f, "{}", json),
|
||||||
|
Err(err) => write!(f, "Error serializing PEX lock: {}", err),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_pex_lock_serialization() {
|
||||||
|
let pex_lock = PexLock {
|
||||||
|
pex_version: PexLock::DEFAULT_PEX_VERSION.to_string(),
|
||||||
|
allow_builds: true,
|
||||||
|
allow_prereleases: false,
|
||||||
|
allow_wheels: true,
|
||||||
|
build_isolation: true,
|
||||||
|
prefer_older_binary: false,
|
||||||
|
use_pep517: None,
|
||||||
|
resolver_version: PexLock::DEFAULT_PEX_VERSION.to_string(),
|
||||||
|
style: "universal".to_string(),
|
||||||
|
transitive: true,
|
||||||
|
requires_python: vec![">=3.8".to_string()],
|
||||||
|
requirements: vec!["requests==2.31.0".to_string()],
|
||||||
|
constraints: vec![],
|
||||||
|
locked_resolves: vec![],
|
||||||
|
};
|
||||||
|
|
||||||
|
let json = pex_lock.to_json().unwrap();
|
||||||
|
assert!(json.contains("\"pex_version\": \"2.44.0\""));
|
||||||
|
assert!(json.contains("\"allow_builds\": true"));
|
||||||
|
}
|
||||||
|
}
|
|
@ -53,7 +53,7 @@ use uv_workspace::WorkspaceMember;
|
||||||
use crate::fork_strategy::ForkStrategy;
|
use crate::fork_strategy::ForkStrategy;
|
||||||
pub(crate) use crate::lock::export::PylockTomlPackage;
|
pub(crate) use crate::lock::export::PylockTomlPackage;
|
||||||
pub use crate::lock::export::RequirementsTxtExport;
|
pub use crate::lock::export::RequirementsTxtExport;
|
||||||
pub use crate::lock::export::{PylockToml, PylockTomlErrorKind};
|
pub use crate::lock::export::{PexLock, PylockToml, PylockTomlErrorKind};
|
||||||
pub use crate::lock::installable::Installable;
|
pub use crate::lock::installable::Installable;
|
||||||
pub use crate::lock::map::PackageMap;
|
pub use crate::lock::map::PackageMap;
|
||||||
pub use crate::lock::tree::TreeDisplay;
|
pub use crate::lock::tree::TreeDisplay;
|
||||||
|
@ -63,7 +63,7 @@ use crate::{
|
||||||
ExcludeNewer, InMemoryIndex, MetadataResponse, PrereleaseMode, ResolutionMode, ResolverOutput,
|
ExcludeNewer, InMemoryIndex, MetadataResponse, PrereleaseMode, ResolutionMode, ResolverOutput,
|
||||||
};
|
};
|
||||||
|
|
||||||
mod export;
|
pub(crate) mod export;
|
||||||
mod installable;
|
mod installable;
|
||||||
mod map;
|
mod map;
|
||||||
mod tree;
|
mod tree;
|
||||||
|
|
|
@ -422,6 +422,10 @@ pub(crate) async fn pip_compile(
|
||||||
ExportFormat::PylockToml => {
|
ExportFormat::PylockToml => {
|
||||||
read_pylock_toml_requirements(output_file, &upgrade).await?
|
read_pylock_toml_requirements(output_file, &upgrade).await?
|
||||||
}
|
}
|
||||||
|
ExportFormat::PexLock => {
|
||||||
|
// PEX lock files are not supported for reading locked requirements
|
||||||
|
LockedRequirements::default()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LockedRequirements::default()
|
LockedRequirements::default()
|
||||||
|
@ -692,6 +696,9 @@ pub(crate) async fn pip_compile(
|
||||||
let export = PylockToml::from_resolution(&resolution, &no_emit_packages, install_path)?;
|
let export = PylockToml::from_resolution(&resolution, &no_emit_packages, install_path)?;
|
||||||
write!(writer, "{}", export.to_toml()?)?;
|
write!(writer, "{}", export.to_toml()?)?;
|
||||||
}
|
}
|
||||||
|
ExportFormat::PexLock => {
|
||||||
|
return Err(anyhow::anyhow!("PEX lock format is not supported in pip compile"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// If any "unsafe" packages were excluded, notify the user.
|
// If any "unsafe" packages were excluded, notify the user.
|
||||||
|
|
|
@ -14,7 +14,7 @@ use uv_configuration::{
|
||||||
use uv_normalize::{DefaultExtras, DefaultGroups, PackageName};
|
use uv_normalize::{DefaultExtras, DefaultGroups, PackageName};
|
||||||
use uv_python::{PythonDownloads, PythonPreference, PythonRequest};
|
use uv_python::{PythonDownloads, PythonPreference, PythonRequest};
|
||||||
use uv_requirements::is_pylock_toml;
|
use uv_requirements::is_pylock_toml;
|
||||||
use uv_resolver::{PylockToml, RequirementsTxtExport};
|
use uv_resolver::{PexLock, PylockToml, RequirementsTxtExport, Installable};
|
||||||
use uv_scripts::{Pep723ItemRef, Pep723Script};
|
use uv_scripts::{Pep723ItemRef, Pep723Script};
|
||||||
use uv_settings::PythonInstallMirrors;
|
use uv_settings::PythonInstallMirrors;
|
||||||
use uv_workspace::{DiscoveryOptions, MemberDiscovery, VirtualProject, Workspace, WorkspaceCache};
|
use uv_workspace::{DiscoveryOptions, MemberDiscovery, VirtualProject, Workspace, WorkspaceCache};
|
||||||
|
@ -283,6 +283,13 @@ pub(crate) async fn export(
|
||||||
.is_some_and(is_pylock_toml)
|
.is_some_and(is_pylock_toml)
|
||||||
{
|
{
|
||||||
ExportFormat::PylockToml
|
ExportFormat::PylockToml
|
||||||
|
} else if output_file
|
||||||
|
.as_deref()
|
||||||
|
.and_then(Path::file_name)
|
||||||
|
.and_then(OsStr::to_str)
|
||||||
|
.is_some_and(|name| name.ends_with(".pex.lock") || name.ends_with(".pex.json"))
|
||||||
|
{
|
||||||
|
ExportFormat::PexLock
|
||||||
} else {
|
} else {
|
||||||
ExportFormat::RequirementsTxt
|
ExportFormat::RequirementsTxt
|
||||||
}
|
}
|
||||||
|
@ -348,6 +355,19 @@ pub(crate) async fn export(
|
||||||
}
|
}
|
||||||
write!(writer, "{}", export.to_toml()?)?;
|
write!(writer, "{}", export.to_toml()?)?;
|
||||||
}
|
}
|
||||||
|
ExportFormat::PexLock => {
|
||||||
|
let export = PexLock::from_lock(target.lock())?;
|
||||||
|
|
||||||
|
if include_header {
|
||||||
|
writeln!(
|
||||||
|
writer,
|
||||||
|
"{}",
|
||||||
|
"// This file was autogenerated by uv via the following command:".green()
|
||||||
|
)?;
|
||||||
|
writeln!(writer, "{}", format!("// {}", cmd()).green())?;
|
||||||
|
}
|
||||||
|
write!(writer, "{}", export.to_json()?)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
writer.commit().await?;
|
writer.commit().await?;
|
||||||
|
|
|
@ -4433,3 +4433,4 @@ fn pep_751_https_credentials() -> Result<()> {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue