Rename puffin-distribution to distribution-types (#458)

## Summary

This crate only contains types, and I want to introduce a new crate for
all _operations_ on distributions, so this feels like a more natural
name given we also have `pypi-types`.

Cargo.lock

@@ -869,6 +869,22 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "distribution-types"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "fs-err",
+ "pep440_rs 0.3.12",
+ "puffin-cache",
+ "puffin-git",
+ "puffin-normalize",
+ "pypi-types",
+ "serde",
+ "serde_json",
+ "url",
+]
+
 [[package]]
 name = "doc-comment"
 version = "0.3.3"
@@ -2374,6 +2390,7 @@ dependencies = [
  "chrono",
  "clap",
  "colored",
+ "distribution-types",
  "fs-err",
  "futures",
  "gourgeist",
@@ -2393,7 +2410,6 @@ dependencies = [
  "puffin-cache",
  "puffin-client",
  "puffin-dispatch",
- "puffin-distribution",
  "puffin-installer",
  "puffin-interpreter",
  "puffin-normalize",
@@ -2486,6 +2502,7 @@ name = "puffin-dispatch"
 version = "0.0.1"
 dependencies = [
  "anyhow",
+ "distribution-types",
  "gourgeist",
  "itertools 0.11.0",
  "pep508_rs",
@@ -2493,7 +2510,6 @@ dependencies = [
  "platform-tags",
  "puffin-build",
  "puffin-client",
- "puffin-distribution",
  "puffin-installer",
  "puffin-interpreter",
  "puffin-resolver",
@@ -2503,22 +2519,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "puffin-distribution"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "fs-err",
- "pep440_rs 0.3.12",
- "puffin-cache",
- "puffin-git",
- "puffin-normalize",
- "pypi-types",
- "serde",
- "serde_json",
- "url",
-]
-
 [[package]]
 name = "puffin-git"
 version = "0.0.1"
@@ -2546,6 +2546,7 @@ dependencies = [
  "bytesize",
  "cacache",
  "distribution-filename",
+ "distribution-types",
  "fs-err",
  "fxhash",
  "install-wheel-rs",
@@ -2553,7 +2554,6 @@ dependencies = [
  "pep508_rs",
  "puffin-cache",
  "puffin-client",
- "puffin-distribution",
  "puffin-git",
  "puffin-interpreter",
  "puffin-normalize",
@@ -2616,6 +2616,7 @@ dependencies = [
  "colored",
  "derivative",
  "distribution-filename",
+ "distribution-types",
  "fs-err",
  "futures",
  "fxhash",
@@ -2632,7 +2633,6 @@ dependencies = [
  "pubgrub",
  "puffin-cache",
  "puffin-client",
- "puffin-distribution",
  "puffin-git",
  "puffin-interpreter",
  "puffin-macros",

crates/README.md

@@ -58,7 +58,7 @@ Development utilities for Puffin.
 A centralized `struct` for resolving and building source distributions in isolated environments.
 Implements the traits defined in `puffin-traits`.
 
-## [puffin-distribution](./puffin-distribution)
+## [distribution-types](./distribution-types)
 
 Abstractions for representing built distributions (wheels) and source distributions (sdists), and
 the sources from which they can be downloaded.

crates/distribution-types/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "puffin-distribution"
+name = "distribution-types"
 version = "0.0.1"
 edition = { workspace = true }
 rust-version = { workspace = true }

crates/puffin-cli/Cargo.toml

@@ -25,7 +25,7 @@ platform-tags = { path = "../platform-tags" }
 puffin-cache = { path = "../puffin-cache", features = ["clap"] }
 puffin-client = { path = "../puffin-client" }
 puffin-dispatch = { path = "../puffin-dispatch" }
-puffin-distribution = { path = "../puffin-distribution" }
+distribution-types = { path = "../distribution-types" }
 puffin-installer = { path = "../puffin-installer" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-normalize = { path = "../puffin-normalize" }

crates/puffin-cli/src/commands/pip_sync.rs

@@ -7,13 +7,13 @@ use fs_err as fs;
 use itertools::{Either, Itertools};
 use tracing::debug;
 
+use distribution_types::{AnyDist, Metadata};
 use install_wheel_rs::linker::LinkMode;
 use pep508_rs::Requirement;
 use platform_host::Platform;
 use platform_tags::Tags;
 use puffin_client::RegistryClientBuilder;
 use puffin_dispatch::BuildDispatch;
-use puffin_distribution::{AnyDist, Metadata};
 use puffin_installer::{Builder, InstallPlan};
 use puffin_interpreter::Virtualenv;
 use pypi_types::Yanked;

crates/puffin-cli/src/commands/pip_uninstall.rs

@@ -5,8 +5,8 @@ use anyhow::Result;
 use colored::Colorize;
 use tracing::debug;
 
+use distribution_types::Metadata;
 use platform_host::Platform;
-use puffin_distribution::Metadata;
 use puffin_interpreter::Virtualenv;
 
 use crate::commands::{elapsed, ExitStatus};

crates/puffin-cli/src/commands/reporters.rs

@@ -5,7 +5,7 @@ use std::time::Duration;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use url::Url;
 
-use puffin_distribution::{CachedDist, Dist, Metadata, SourceDist, VersionOrUrl};
+use distribution_types::{CachedDist, Dist, Metadata, SourceDist, VersionOrUrl};
 use puffin_installer::Download;
 use puffin_normalize::ExtraName;
 use puffin_normalize::PackageName;

crates/puffin-dispatch/Cargo.toml

@@ -17,7 +17,7 @@ platform-host = { path = "../platform-host" }
 platform-tags = { path = "../platform-tags" }
 puffin-build = { path = "../puffin-build" }
 puffin-client = { path = "../puffin-client" }
-puffin-distribution = { path = "../puffin-distribution" }
+distribution-types = { path = "../distribution-types" }
 puffin-installer = { path = "../puffin-installer" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-resolver = { path = "../puffin-resolver" }

crates/puffin-dispatch/src/lib.rs

@@ -11,11 +11,11 @@ use anyhow::{bail, Context};
 use itertools::{Either, Itertools};
 use tracing::{debug, instrument};
 
+use distribution_types::Metadata;
 use pep508_rs::Requirement;
 use platform_tags::Tags;
 use puffin_build::{SourceBuild, SourceBuildContext};
 use puffin_client::RegistryClient;
-use puffin_distribution::Metadata;
 use puffin_installer::{Builder, Downloader, InstallPlan, Installer, Unzipper};
 use puffin_interpreter::{InterpreterInfo, Virtualenv};
 use puffin_resolver::{DistFinder, Manifest, ResolutionOptions, Resolver};

crates/puffin-installer/Cargo.toml

@@ -16,7 +16,7 @@ pep440_rs = { path = "../pep440-rs" }
 pep508_rs = { path = "../pep508-rs" }
 puffin-cache = { path = "../puffin-cache" }
 puffin-client = { path = "../puffin-client" }
-puffin-distribution = { path = "../puffin-distribution" }
+distribution-types = { path = "../distribution-types" }
 puffin-git = { path = "../puffin-git" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-normalize = { path = "../puffin-normalize" }

crates/puffin-installer/src/builder.rs

@@ -8,7 +8,7 @@ use anyhow::Result;
 use fs_err::tokio as fs;
 use tracing::debug;
 
-use puffin_distribution::{Dist, Metadata, RemoteSource};
+use distribution_types::{Dist, Metadata, RemoteSource};
 use puffin_traits::BuildContext;
 
 use crate::downloader::{DiskWheel, SourceDistDownload, WheelDownload};

crates/puffin-installer/src/cache.rs

@@ -2,7 +2,7 @@ use std::path::{Path, PathBuf};
 
 use fs_err as fs;
 
-use puffin_distribution::{BuiltDist, Dist, Metadata, SourceDist};
+use distribution_types::{BuiltDist, Dist, Metadata, SourceDist};
 
 static WHEEL_CACHE: &str = "wheels-v0";
 

crates/puffin-installer/src/downloader.rs

@@ -10,9 +10,9 @@ use tokio_util::compat::FuturesAsyncReadCompatExt;
 use tracing::debug;
 use url::Url;
 
+use distribution_types::direct_url::{DirectArchiveUrl, DirectGitUrl};
+use distribution_types::{BuiltDist, Dist, RemoteSource, SourceDist};
 use puffin_client::RegistryClient;
-use puffin_distribution::direct_url::{DirectArchiveUrl, DirectGitUrl};
-use puffin_distribution::{BuiltDist, Dist, RemoteSource, SourceDist};
 use puffin_git::GitSource;
 
 use crate::locks::Locks;

crates/puffin-installer/src/installer.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Error, Result};
 use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 
-use puffin_distribution::CachedDist;
+use distribution_types::CachedDist;
 use puffin_interpreter::Virtualenv;
 
 pub struct Installer<'a> {

crates/puffin-installer/src/locks.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use fxhash::FxHashMap;
 use tokio::sync::Mutex;
 
-use puffin_distribution::Identifier;
+use distribution_types::Identifier;
 
 /// A set of locks used to prevent concurrent access to the same resource.
 #[derive(Debug, Default)]

crates/puffin-installer/src/plan.rs

@@ -3,9 +3,9 @@ use std::path::Path;
 use anyhow::{Context, Result};
 use tracing::debug;
 
+use distribution_types::direct_url::DirectUrl;
+use distribution_types::{CachedDist, InstalledDist};
 use pep508_rs::{Requirement, VersionOrUrl};
-use puffin_distribution::direct_url::DirectUrl;
-use puffin_distribution::{CachedDist, InstalledDist};
 use puffin_interpreter::Virtualenv;
 
 use crate::url_index::UrlIndex;

crates/puffin-installer/src/registry_index.rs

@@ -4,7 +4,7 @@ use std::path::Path;
 use fs_err as fs;
 use tracing::warn;
 
-use puffin_distribution::{CachedRegistryDist, Metadata};
+use distribution_types::{CachedRegistryDist, Metadata};
 use puffin_normalize::PackageName;
 
 use crate::cache::{CacheShard, WheelCache};

crates/puffin-installer/src/site_packages.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use anyhow::Result;
 use fs_err as fs;
 
-use puffin_distribution::{InstalledDist, Metadata};
+use distribution_types::{InstalledDist, Metadata};
 use puffin_interpreter::Virtualenv;
 use puffin_normalize::PackageName;
 

crates/puffin-installer/src/uninstall.rs

@@ -1,6 +1,6 @@
 use anyhow::Result;
 
-use puffin_distribution::InstalledDist;
+use distribution_types::InstalledDist;
 
 /// Uninstall a package from the specified Python environment.
 pub async fn uninstall(dist: &InstalledDist) -> Result<install_wheel_rs::Uninstall> {

crates/puffin-installer/src/unzipper.rs

@@ -8,7 +8,7 @@ use rayon::iter::ParallelIterator;
 use tracing::debug;
 use zip::ZipArchive;
 
-use puffin_distribution::{CachedDist, Dist, Identifier};
+use distribution_types::{CachedDist, Dist, Identifier};
 
 use crate::cache::WheelCache;
 use crate::downloader::WheelDownload;

crates/puffin-installer/src/url_index.rs

@@ -4,7 +4,7 @@ use fxhash::FxHashMap;
 use tracing::warn;
 use url::Url;
 
-use puffin_distribution::{CachedDirectUrlDist, Identifier};
+use distribution_types::{CachedDirectUrlDist, Identifier};
 use puffin_normalize::PackageName;
 
 use crate::cache::{CacheShard, WheelCache};

crates/puffin-resolver/Cargo.toml

@@ -18,7 +18,7 @@ platform-host = { path = "../platform-host" }
 platform-tags = { path = "../platform-tags" }
 puffin-cache = { path = "../puffin-cache" }
 puffin-client = { path = "../puffin-client" }
-puffin-distribution = { path = "../puffin-distribution" }
+distribution-types = { path = "../distribution-types" }
 puffin-git = { path = "../puffin-git" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-macros = { path = "../puffin-macros" }

crates/puffin-resolver/src/distribution/built_dist.rs

@@ -7,9 +7,9 @@ use tokio_util::compat::FuturesAsyncReadCompatExt;
 use tracing::debug;
 
 use distribution_filename::WheelFilename;
+use distribution_types::{DirectUrlBuiltDist, Identifier, RemoteSource};
 use platform_tags::Tags;
 use puffin_client::RegistryClient;
-use puffin_distribution::{DirectUrlBuiltDist, Identifier, RemoteSource};
 use pypi_types::Metadata21;
 
 use crate::distribution::cached_wheel::CachedWheel;

crates/puffin-resolver/src/distribution/cached_wheel.rs

@@ -5,9 +5,9 @@ use anyhow::{format_err, Result};
 use zip::ZipArchive;
 
 use distribution_filename::WheelFilename;
+use distribution_types::Identifier;
 use install_wheel_rs::find_dist_info;
 use platform_tags::Tags;
-use puffin_distribution::Identifier;
 use pypi_types::Metadata21;
 
 /// A cached wheel built from a remote source.

crates/puffin-resolver/src/distribution/source_dist.rs

@@ -12,10 +12,10 @@ use tracing::debug;
 use url::Url;
 
 use distribution_filename::WheelFilename;
+use distribution_types::direct_url::{DirectArchiveUrl, DirectGitUrl};
+use distribution_types::{Identifier, RemoteSource, SourceDist};
 use platform_tags::Tags;
 use puffin_client::RegistryClient;
-use puffin_distribution::direct_url::{DirectArchiveUrl, DirectGitUrl};
-use puffin_distribution::{Identifier, RemoteSource, SourceDist};
 use puffin_git::{GitSource, GitUrl};
 use puffin_traits::BuildContext;
 use pypi_types::Metadata21;

crates/puffin-resolver/src/error.rs

@@ -5,8 +5,8 @@ use pubgrub::report::Reporter;
 use thiserror::Error;
 use url::Url;
 
+use distribution_types::{BuiltDist, SourceDist};
 use pep508_rs::Requirement;
-use puffin_distribution::{BuiltDist, SourceDist};
 use puffin_normalize::PackageName;
 
 use crate::pubgrub::{PubGrubPackage, PubGrubVersion};

crates/puffin-resolver/src/finder.rs

@@ -10,11 +10,11 @@ use futures::{StreamExt, TryFutureExt};
 use fxhash::FxHashMap;
 
 use distribution_filename::{SourceDistFilename, WheelFilename};
+use distribution_types::Dist;
 use pep440_rs::Version;
 use pep508_rs::{Requirement, VersionOrUrl};
 use platform_tags::{TagPriority, Tags};
 use puffin_client::RegistryClient;
-use puffin_distribution::Dist;
 use puffin_interpreter::InterpreterInfo;
 use puffin_normalize::PackageName;
 use pypi_types::{File, SimpleJson};

crates/puffin-resolver/src/locks.rs

@@ -3,7 +3,7 @@ use std::sync::Arc;
 use fxhash::FxHashMap;
 use tokio::sync::Mutex;
 
-use puffin_distribution::Identifier;
+use distribution_types::Identifier;
 
 /// A set of locks used to prevent concurrent access to the same resource.
 #[derive(Debug, Default)]

crates/puffin-resolver/src/resolution.rs

@@ -10,9 +10,9 @@ use pubgrub::type_aliases::SelectedDependencies;
 use url::Url;
 use waitmap::WaitMap;
 
+use distribution_types::{BuiltDist, Dist, Metadata, SourceDist};
 use pep440_rs::{Version, VersionSpecifier, VersionSpecifiers};
 use pep508_rs::{Requirement, VersionOrUrl};
-use puffin_distribution::{BuiltDist, Dist, Metadata, SourceDist};
 use puffin_normalize::PackageName;
 use pypi_types::File;
 

crates/puffin-resolver/src/resolver.rs

@@ -17,14 +17,14 @@ use url::Url;
 use waitmap::WaitMap;
 
 use distribution_filename::WheelFilename;
+use distribution_types::{
+    BuiltDist, DirectUrlSourceDist, Dist, GitSourceDist, Identifier, Metadata, SourceDist,
+    VersionOrUrl,
+};
 use pep508_rs::{MarkerEnvironment, Requirement};
 use platform_tags::Tags;
 use puffin_cache::CanonicalUrl;
 use puffin_client::RegistryClient;
-use puffin_distribution::{
-    BuiltDist, DirectUrlSourceDist, Dist, GitSourceDist, Identifier, Metadata, SourceDist,
-    VersionOrUrl,
-};
 use puffin_normalize::{ExtraName, PackageName};
 use puffin_traits::BuildContext;
 use pypi_types::{File, Metadata21, SimpleJson};