Move crate

Author: charliermarsh

Cargo.lock

@@ -30,6 +30,7 @@ requirements-txt = { path = "crates/requirements-txt" }
 uv-auth = { path = "crates/uv-auth" }
 uv-build = { path = "crates/uv-build" }
 uv-cache = { path = "crates/uv-cache" }
+uv-cache-info = { path = "crates/uv-cache-info" }
 uv-cli = { path = "crates/uv-cli" }
 uv-client = { path = "crates/uv-client" }
 uv-configuration = { path = "crates/uv-configuration" }

Cargo.toml

@@ -19,6 +19,7 @@ pep440_rs = { workspace = true }
 pep508_rs = { workspace = true, features = ["serde"] }
 platform-tags = { workspace = true }
 pypi-types = { workspace = true }
+uv-cache-info = { workspace = true }
 uv-fs = { workspace = true }
 uv-git = { workspace = true }
 uv-normalize = { workspace = true }
@@ -32,7 +33,6 @@ schemars = { workspace = true, optional = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-toml = { workspace = true }
 tracing = { workspace = true }
 url = { workspace = true }
-urlencoding = { workspace = true }
+urlencoding = { workspace = true }

crates/distribution-types/Cargo.toml

@@ -5,11 +5,12 @@ use anyhow::{anyhow, Result};
 use distribution_filename::WheelFilename;
 use pep508_rs::VerbatimUrl;
 use pypi_types::{HashDigest, ParsedDirectoryUrl};
+use uv_cache_info::CacheInfo;
 use uv_normalize::PackageName;
 
 use crate::{
-    BuiltDist, CacheInfo, Dist, DistributionMetadata, Hashed, InstalledMetadata, InstalledVersion,
-    Name, ParsedUrl, SourceDist, VersionOrUrlRef,
+    BuiltDist, Dist, DistributionMetadata, Hashed, InstalledMetadata, InstalledVersion, Name,
+    ParsedUrl, SourceDist, VersionOrUrlRef,
 };
 
 /// A built distribution (wheel) that exists in the local cache.

crates/distribution-types/src/cached.rs

@@ -10,10 +10,10 @@ use url::Url;
 use distribution_filename::EggInfoFilename;
 use pep440_rs::Version;
 use pypi_types::DirectUrl;
+use uv_cache_info::CacheInfo;
 use uv_fs::Simplified;
 use uv_normalize::PackageName;
 
-use crate::cache_info::CacheInfo;
 use crate::{DistributionMetadata, InstalledMetadata, InstalledVersion, Name, VersionOrUrlRef};
 
 /// A built distribution (wheel) that is installed in a virtual environment.
@@ -36,7 +36,7 @@ pub struct InstalledRegistryDist {
     pub name: PackageName,
     pub version: Version,
     pub path: PathBuf,
-    pub cache: Option<CacheInfo>,
+    pub cache_info: Option<CacheInfo>,
 }
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
@@ -47,7 +47,7 @@ pub struct InstalledDirectUrlDist {
     pub url: Url,
     pub editable: bool,
     pub path: PathBuf,
-    pub cache: Option<CacheInfo>,
+    pub cache_info: Option<CacheInfo>,
 }
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
@@ -93,7 +93,7 @@ impl InstalledDist {
 
             let name = PackageName::from_str(name)?;
             let version = Version::from_str(version).map_err(|err| anyhow!(err))?;
-            let cache = Self::cache_info(path)?;
+            let cache_info = Self::cache_info(path)?;
 
             return if let Some(direct_url) = Self::direct_url(path)? {
                 match Url::try_from(&direct_url) {
@@ -104,15 +104,15 @@ impl InstalledDist {
                         direct_url: Box::new(direct_url),
                         url,
                         path: path.to_path_buf(),
-                        cache,
+                        cache_info,
                     }))),
                     Err(err) => {
                         warn!("Failed to parse direct URL: {err}");
                         Ok(Some(Self::Registry(InstalledRegistryDist {
                             name,
                             version,
                             path: path.to_path_buf(),
-                            cache,
+                            cache_info,
                         })))
                     }
                 }
@@ -121,7 +121,7 @@ impl InstalledDist {
                     name,
                     version,
                     path: path.to_path_buf(),
-                    cache,
+                    cache_info,
                 })))
             };
         }

crates/distribution-types/src/installed.rs

@@ -50,7 +50,6 @@ use uv_normalize::PackageName;
 pub use crate::annotation::*;
 pub use crate::any::*;
 pub use crate::buildable::*;
-pub use crate::cache_info::*;
 pub use crate::cached::*;
 pub use crate::diagnostic::*;
 pub use crate::error::*;
@@ -63,15 +62,12 @@ pub use crate::prioritized_distribution::*;
 pub use crate::resolution::*;
 pub use crate::resolved::*;
 pub use crate::specified_requirement::*;
-pub use crate::timestamp::*;
 pub use crate::traits::*;
 
 mod annotation;
 mod any;
 mod buildable;
-mod cache_info;
 mod cached;
-mod commit_info;
 mod diagnostic;
 mod error;
 mod file;
@@ -83,7 +79,6 @@ mod prioritized_distribution;
 mod resolution;
 mod resolved;
 mod specified_requirement;
-mod timestamp;
 mod traits;
 
 #[derive(Debug, Clone)]

crates/distribution-types/src/lib.rs

@@ -21,10 +21,10 @@ name = "install_wheel_rs"
 
 [dependencies]
 distribution-filename = { workspace = true }
-distribution-types = { workspace = true }
 pep440_rs = { workspace = true }
 platform-tags = { workspace = true }
 pypi-types = { workspace = true }
+uv-cache-info = { workspace = true }
 uv-fs = { workspace = true }
 uv-normalize = { workspace = true }
 uv-warnings = { workspace = true }

crates/install-wheel-rs/Cargo.toml

@@ -1,15 +1,3 @@
-Reimplementation of wheel installing in rust. Supports both classical venvs and monotrail.
+# install-wheel-rs
 
-There are simple python bindings:
-
-```python
-from install_wheel_rs import LockedVenv
-
-locked_venv = LockedVenv("path/to/.venv")
-locked_venv.install_wheel("path/to/some_tagged_wheel.whl")
-```
-
-and there's only one function: `install_wheels_venv(wheels: List[str], venv: str)`, where `wheels`
-is a list of paths to wheel files and `venv` is the location of the venv to install the packages in.
-
-See monotrail for benchmarks.
+Reimplementation of wheel installing in Rust.

crates/install-wheel-rs/Readme.md

@@ -12,7 +12,6 @@ use crate::wheel::{
 };
 use crate::{Error, Layout};
 use distribution_filename::WheelFilename;
-use distribution_types::CacheInfo;
 use fs_err as fs;
 use fs_err::{DirEntry, File};
 use pypi_types::{DirectUrl, Metadata12};
@@ -21,6 +20,7 @@ use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use tempfile::tempdir_in;
 use tracing::{debug, instrument};
+use uv_cache_info::CacheInfo;
 use uv_warnings::warn_user_once;
 use walkdir::WalkDir;
 

crates/install-wheel-rs/src/linker.rs

@@ -3,25 +3,24 @@ use std::io::{BufReader, Cursor, Read, Seek, Write};
 use std::path::{Path, PathBuf};
 use std::{env, io};
 
+use crate::record::RecordEntry;
+use crate::script::Script;
+use crate::{Error, Layout};
 use data_encoding::BASE64URL_NOPAD;
-use distribution_types::CacheInfo;
 use fs_err as fs;
 use fs_err::{DirEntry, File};
 use mailparse::parse_headers;
 use pypi_types::DirectUrl;
 use rustc_hash::FxHashMap;
 use sha2::{Digest, Sha256};
 use tracing::{instrument, warn};
+use uv_cache_info::CacheInfo;
 use uv_fs::{relative_to, Simplified};
 use uv_normalize::PackageName;
 use walkdir::WalkDir;
 use zip::write::FileOptions;
 use zip::ZipWriter;
 
-use crate::record::RecordEntry;
-use crate::script::Script;
-use crate::{Error, Layout};
-
 const LAUNCHER_MAGIC_NUMBER: [u8; 4] = [b'U', b'V', b'U', b'V'];
 
 #[cfg(all(windows, target_arch = "x86"))]