Split puffin-package into requirements.txt parser and pypi-types (#341)

There are only two things left in this crate and they don't really have
anything to do with one another.

crates/puffin-resolver/Cargo.toml

@@ -10,6 +10,7 @@ authors = { workspace = true }
 license = { workspace = true }
 
 [dependencies]
+distribution-filename = { path = "../distribution-filename" }
 install-wheel-rs = { path = "../install-wheel-rs" }
 pep440_rs = { path = "../pep440-rs" }
 pep508_rs = { path = "../pep508-rs" }
@@ -19,11 +20,10 @@ pubgrub = { path = "../../vendor/pubgrub" }
 puffin-cache = { path = "../puffin-cache" }
 puffin-client = { path = "../puffin-client" }
 puffin-distribution = { path = "../puffin-distribution" }
-puffin-normalize = { path = "../puffin-normalize" }
-puffin-package = { path = "../puffin-package" }
-puffin-traits = { path = "../puffin-traits" }
 puffin-git = { path = "../puffin-git" }
-distribution-filename = { path = "../distribution-filename" }
+puffin-normalize = { path = "../puffin-normalize" }
+puffin-traits = { path = "../puffin-traits" }
+pypi-types = { path = "../pypi-types" }
 
 anyhow = { workspace = true }
 bitflags = { workspace = true }

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

@@ -7,7 +7,7 @@ use zip::ZipArchive;
 use distribution_filename::WheelFilename;
 use platform_tags::Tags;
 use puffin_distribution::RemoteDistributionRef;
-use puffin_package::pypi_types::Metadata21;
+use pypi_types::Metadata21;
 
 /// A cached wheel built from a remote source.
 #[derive(Debug)]

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

@@ -17,8 +17,8 @@ use puffin_client::RegistryClient;
 use puffin_distribution::source::Source;
 use puffin_distribution::RemoteDistributionRef;
 use puffin_git::{Git, GitSource};
-use puffin_package::pypi_types::Metadata21;
 use puffin_traits::BuildContext;
+use pypi_types::Metadata21;
 
 use crate::distribution::cached_wheel::CachedWheel;
 

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

@@ -11,7 +11,7 @@ use distribution_filename::WheelFilename;
 use platform_tags::Tags;
 use puffin_client::RegistryClient;
 use puffin_distribution::RemoteDistributionRef;
-use puffin_package::pypi_types::Metadata21;
+use pypi_types::Metadata21;
 
 use crate::distribution::cached_wheel::CachedWheel;
 

crates/puffin-resolver/src/file.rs

@@ -1,7 +1,7 @@
 use distribution_filename::{SourceDistributionFilename, WheelFilename};
 use std::ops::Deref;
 
-use puffin_package::pypi_types::File;
+use pypi_types::File;
 
 /// A distribution can either be a wheel or a source distribution.
 #[derive(Debug, Clone)]

crates/puffin-resolver/src/finder.rs

@@ -15,7 +15,7 @@ use platform_tags::Tags;
 use puffin_client::RegistryClient;
 use puffin_distribution::RemoteDistribution;
 use puffin_normalize::PackageName;
-use puffin_package::pypi_types::{File, SimpleJson};
+use pypi_types::{File, SimpleJson};
 
 use crate::error::ResolveError;
 use crate::resolution::Resolution;

crates/puffin-resolver/src/resolution.rs

@@ -13,7 +13,7 @@ use pep440_rs::{Version, VersionSpecifier, VersionSpecifiers};
 use pep508_rs::{Requirement, VersionOrUrl};
 use puffin_distribution::RemoteDistribution;
 use puffin_normalize::PackageName;
-use puffin_package::pypi_types::File;
+use pypi_types::File;
 
 use crate::pubgrub::{PubGrubPackage, PubGrubPriority, PubGrubVersion};
 

crates/puffin-resolver/src/resolver.rs

@@ -25,8 +25,8 @@ use puffin_cache::{CanonicalUrl, RepositoryUrl};
 use puffin_client::RegistryClient;
 use puffin_distribution::{RemoteDistributionRef, VersionOrUrl};
 use puffin_normalize::{ExtraName, PackageName};
-use puffin_package::pypi_types::{File, Metadata21, SimpleJson};
 use puffin_traits::BuildContext;
+use pypi_types::{File, Metadata21, SimpleJson};
 
 use crate::candidate_selector::CandidateSelector;
 use crate::distribution::{SourceDistributionFetcher, WheelFetcher};