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.

Cargo.lock

@@ -2232,10 +2232,11 @@ dependencies = [
  "puffin-installer",
  "puffin-interpreter",
  "puffin-normalize",
- "puffin-package",
  "puffin-resolver",
  "puffin-workspace",
+ "pypi-types",
  "pyproject-toml",
+ "requirements-txt",
  "tempfile",
  "thiserror",
  "tokio",
@@ -2261,7 +2262,7 @@ dependencies = [
  "install-wheel-rs",
  "puffin-cache",
  "puffin-normalize",
- "puffin-package",
+ "pypi-types",
  "reqwest",
  "reqwest-middleware",
  "reqwest-retry",
@@ -2296,8 +2297,8 @@ dependencies = [
  "puffin-client",
  "puffin-dispatch",
  "puffin-interpreter",
- "puffin-package",
  "puffin-traits",
+ "pypi-types",
  "tempfile",
  "tokio",
  "tracing",
@@ -2322,9 +2323,9 @@ dependencies = [
  "puffin-distribution",
  "puffin-installer",
  "puffin-interpreter",
- "puffin-package",
  "puffin-resolver",
  "puffin-traits",
+ "pypi-types",
  "tempfile",
  "tracing",
 ]
@@ -2338,7 +2339,7 @@ dependencies = [
  "puffin-cache",
  "puffin-git",
  "puffin-normalize",
- "puffin-package",
+ "pypi-types",
  "url",
 ]
 
@@ -2379,8 +2380,8 @@ dependencies = [
  "puffin-git",
  "puffin-interpreter",
  "puffin-normalize",
- "puffin-package",
  "puffin-traits",
+ "pypi-types",
  "rayon",
  "tempfile",
  "thiserror",
@@ -2412,39 +2413,9 @@ dependencies = [
 name = "puffin-normalize"
 version = "0.0.1"
 dependencies = [
- "anyhow",
- "indoc",
- "insta",
  "once_cell",
  "regex",
  "serde",
- "serde_json",
- "tempfile",
- "test-case",
-]
-
-[[package]]
-name = "puffin-package"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "fs-err",
- "indoc",
- "insta",
- "mailparse",
- "once_cell",
- "pep440_rs 0.3.12",
- "pep508_rs",
- "puffin-normalize",
- "regex",
- "rfc2047-decoder",
- "serde",
- "serde_json",
- "tempfile",
- "test-case",
- "thiserror",
- "tracing",
- "unscanny",
 ]
 
 [[package]]
@@ -2477,8 +2448,8 @@ dependencies = [
  "puffin-git",
  "puffin-interpreter",
  "puffin-normalize",
- "puffin-package",
  "puffin-traits",
+ "pypi-types",
  "sha2",
  "tempfile",
  "thiserror",
@@ -2585,6 +2556,27 @@ dependencies = [
  "syn 2.0.39",
 ]
 
+[[package]]
+name = "pypi-types"
+version = "0.0.1"
+dependencies = [
+ "indoc",
+ "insta",
+ "mailparse",
+ "once_cell",
+ "pep440_rs 0.3.12",
+ "pep508_rs",
+ "puffin-normalize",
+ "regex",
+ "rfc2047-decoder",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "test-case",
+ "thiserror",
+ "tracing",
+]
+
 [[package]]
 name = "pyproject-toml"
 version = "0.8.0"
@@ -2765,6 +2757,28 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
+[[package]]
+name = "requirements-txt"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "fs-err",
+ "indoc",
+ "insta",
+ "once_cell",
+ "pep440_rs 0.3.12",
+ "pep508_rs",
+ "puffin-normalize",
+ "regex",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "test-case",
+ "thiserror",
+ "tracing",
+ "unscanny",
+]
+
 [[package]]
 name = "reqwest"
 version = "0.11.22"

crates/puffin-cli/Cargo.toml

@@ -27,7 +27,8 @@ puffin-distribution = { path = "../puffin-distribution" }
 puffin-installer = { path = "../puffin-installer" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-normalize = { path = "../puffin-normalize" }
-puffin-package = { path = "../puffin-package" }
+pypi-types = { path = "../pypi-types" }
+requirements-txt = { path = "../requirements-txt" }
 puffin-resolver = { path = "../puffin-resolver", features = ["clap"] }
 puffin-workspace = { path = "../puffin-workspace" }
 

crates/puffin-cli/src/requirements.rs

@@ -9,7 +9,7 @@ use fs_err as fs;
 
 use pep508_rs::Requirement;
 use puffin_normalize::{ExtraName, PackageName};
-use puffin_package::requirements_txt::RequirementsTxt;
+use requirements_txt::RequirementsTxt;
 
 #[derive(Debug)]
 pub(crate) enum RequirementsSource {

crates/puffin-client/Cargo.toml

@@ -8,7 +8,7 @@ distribution-filename = { path = "../distribution-filename" }
 install-wheel-rs = { path = "../install-wheel-rs" }
 puffin-cache = { path = "../puffin-cache" }
 puffin-normalize = { path = "../puffin-normalize" }
-puffin-package = { path = "../puffin-package" }
+pypi-types = { path = "../pypi-types" }
 
 async_http_range_reader = { workspace = true }
 async_zip = { workspace = true }

crates/puffin-client/src/client.rs

@@ -21,7 +21,7 @@ use url::Url;
 use distribution_filename::WheelFilename;
 use install_wheel_rs::find_dist_info_metadata;
 use puffin_normalize::PackageName;
-use puffin_package::pypi_types::{File, Metadata21, SimpleJson};
+use pypi_types::{File, Metadata21, SimpleJson};
 
 use crate::error::Error;
 use crate::remote_metadata::{

crates/puffin-client/src/error.rs

@@ -5,7 +5,6 @@ use async_zip::error::ZipError;
 use thiserror::Error;
 
 use distribution_filename::WheelFilename;
-use puffin_package::pypi_types;
 
 #[derive(Debug, Error)]
 pub enum Error {

crates/puffin-client/src/remote_metadata.rs

@@ -10,7 +10,7 @@ use url::Url;
 use distribution_filename::WheelFilename;
 use install_wheel_rs::find_dist_info_metadata;
 use puffin_cache::CanonicalUrl;
-use puffin_package::pypi_types::Metadata21;
+use pypi_types::Metadata21;
 
 use crate::Error;
 

crates/puffin-dev/Cargo.toml

@@ -20,7 +20,7 @@ puffin-build = { path = "../puffin-build" }
 puffin-client = { path = "../puffin-client" }
 puffin-dispatch = { path = "../puffin-dispatch" }
 puffin-interpreter = { path = "../puffin-interpreter" }
-puffin-package = { path = "../puffin-package" }
+pypi-types = { path = "../pypi-types" }
 puffin-traits = { path = "../puffin-traits" }
 
 anyhow = { workspace = true }

crates/puffin-dispatch/Cargo.toml

@@ -20,9 +20,9 @@ puffin-client = { path = "../puffin-client" }
 puffin-distribution = { path = "../puffin-distribution" }
 puffin-installer = { path = "../puffin-installer" }
 puffin-interpreter = { path = "../puffin-interpreter" }
-puffin-package = { path = "../puffin-package" }
 puffin-resolver = { path = "../puffin-resolver" }
 puffin-traits = { path = "../puffin-traits" }
+pypi-types = { path = "../pypi-types" }
 
 anyhow = { workspace = true }
 itertools = { workspace = true }

crates/puffin-distribution/Cargo.toml

@@ -14,7 +14,7 @@ pep440_rs = { path = "../pep440-rs" }
 puffin-cache = { path = "../puffin-cache" }
 puffin-git = { path = "../puffin-git" }
 puffin-normalize = { path = "../puffin-normalize" }
-puffin-package = { path = "../puffin-package" }
+pypi-types = { path = "../pypi-types" }
 
 anyhow = { workspace = true }
 url = { workspace = true }

crates/puffin-distribution/src/lib.rs

@@ -8,7 +8,7 @@ use url::Url;
 use pep440_rs::Version;
 use puffin_cache::CanonicalUrl;
 use puffin_normalize::PackageName;
-use puffin_package::pypi_types::File;
+use pypi_types::File;
 
 pub mod source;
 

crates/puffin-installer/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", default-features = false }
 pep440_rs = { path = "../pep440-rs" }
 pep508_rs = { path = "../pep508-rs" }
@@ -19,9 +20,8 @@ puffin-distribution = { path = "../puffin-distribution" }
 puffin-git = { path = "../puffin-git" }
 puffin-interpreter = { path = "../puffin-interpreter" }
 puffin-normalize = { path = "../puffin-normalize" }
-puffin-package = { path = "../puffin-package" }
 puffin-traits = { path = "../puffin-traits" }
-distribution-filename = { path = "../distribution-filename" }
+pypi-types = { path = "../pypi-types" }
 
 anyhow = { workspace = true }
 cacache = { workspace = true }

crates/puffin-normalize/Cargo.toml

@@ -5,14 +5,6 @@ edition = "2021"
 description = "Normalization for distribution, package and extra anmes"
 
 [dependencies]
-anyhow = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-
-[dev-dependencies]
-indoc = { version = "2.0.4" }
-insta = { version = "1.34.0" }
-serde_json = { version = "1.0.108" }
-tempfile = { version = "3.8.1" }
-test-case = { version = "3.2.1" }

crates/puffin-package/src/lib.rs

@@ -1,2 +0,0 @@
-pub mod pypi_types;
-pub mod requirements_txt;

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};

crates/pypi-types/Cargo.toml

@@ -0,0 +1,30 @@
+[package]
+name = "pypi-types"
+version = "0.0.1"
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
+pep440_rs = { path = "../pep440-rs", features = ["serde"] }
+pep508_rs = { path = "../pep508-rs", features = ["serde"] }
+puffin-normalize = { path = "../puffin-normalize" }
+
+mailparse = { workspace = true }
+once_cell = { workspace = true }
+regex = { workspace = true }
+rfc2047-decoder = { workspace = true }
+serde = { workspace = true }
+thiserror = { workspace = true }
+tracing = { workspace = true }
+
+[dev-dependencies]
+indoc = { version = "2.0.4" }
+insta = { version = "1.34.0" }
+serde_json = { version = "1.0.108" }
+tempfile = { version = "3.8.1" }
+test-case = { version = "3.2.1" }

crates/requirements-txt/Cargo.toml

@@ -1,25 +1,29 @@
 [package]
-name = "puffin-package"
+name = "requirements-txt"
 version = "0.0.1"
-edition = "2021"
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
 
 [dependencies]
 pep440_rs = { path = "../pep440-rs", features = ["serde"] }
 pep508_rs = { path = "../pep508-rs", features = ["serde"] }
 puffin-normalize = { path = "../puffin-normalize" }
 
-anyhow = { workspace = true }
 fs-err = { workspace = true }
-mailparse = { workspace = true }
 once_cell = { workspace = true }
 regex = { workspace = true }
-rfc2047-decoder = { workspace = true }
 serde = { workspace = true }
 thiserror = { workspace = true }
-tracing.workspace = true
+tracing = { workspace = true }
 unscanny = { workspace = true }
 
 [dev-dependencies]
+anyhow = { workspace = true }
 indoc = { version = "2.0.4" }
 insta = { version = "1.34.0" }
 serde_json = { version = "1.0.108" }

crates/requirements-txt/src/lib.rs

@@ -473,7 +473,7 @@ mod test {
     use tempfile::tempdir;
     use test_case::test_case;
 
-    use crate::requirements_txt::RequirementsTxt;
+    use crate::RequirementsTxt;
 
     #[test_case(Path::new("basic.txt"))]
     #[test_case(Path::new("constraints-a.txt"))]

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-empty.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-empty.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {

crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap

@@ -1,5 +1,5 @@
 ---
-source: crates/puffin-package/src/requirements_txt.rs
+source: crates/requirements-txt/src/lib.rs
 expression: actual
 ---
 RequirementsTxt {