diff --git a/Cargo.lock b/Cargo.lock index 9c0fc06bd..0fd03a70d 100644 --- a/Cargo.lock +++ b/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" diff --git a/crates/puffin-cli/Cargo.toml b/crates/puffin-cli/Cargo.toml index 1566e6116..a4e7ab46d 100644 --- a/crates/puffin-cli/Cargo.toml +++ b/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" } diff --git a/crates/puffin-cli/src/requirements.rs b/crates/puffin-cli/src/requirements.rs index af066d460..c3350e86b 100644 --- a/crates/puffin-cli/src/requirements.rs +++ b/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 { diff --git a/crates/puffin-client/Cargo.toml b/crates/puffin-client/Cargo.toml index bbdfa80ad..8bd364361 100644 --- a/crates/puffin-client/Cargo.toml +++ b/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 } diff --git a/crates/puffin-client/src/client.rs b/crates/puffin-client/src/client.rs index 1c1429b46..1f8f19bf0 100644 --- a/crates/puffin-client/src/client.rs +++ b/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::{ diff --git a/crates/puffin-client/src/error.rs b/crates/puffin-client/src/error.rs index 7d97b6cbe..a65541e7d 100644 --- a/crates/puffin-client/src/error.rs +++ b/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 { diff --git a/crates/puffin-client/src/remote_metadata.rs b/crates/puffin-client/src/remote_metadata.rs index 516558eb6..32dc18d5f 100644 --- a/crates/puffin-client/src/remote_metadata.rs +++ b/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; diff --git a/crates/puffin-dev/Cargo.toml b/crates/puffin-dev/Cargo.toml index d10f76561..bbb4261e5 100644 --- a/crates/puffin-dev/Cargo.toml +++ b/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 } diff --git a/crates/puffin-dispatch/Cargo.toml b/crates/puffin-dispatch/Cargo.toml index a8f59491e..317c97245 100644 --- a/crates/puffin-dispatch/Cargo.toml +++ b/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 } diff --git a/crates/puffin-distribution/Cargo.toml b/crates/puffin-distribution/Cargo.toml index aa6ce0481..15fc36319 100644 --- a/crates/puffin-distribution/Cargo.toml +++ b/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 } diff --git a/crates/puffin-distribution/src/lib.rs b/crates/puffin-distribution/src/lib.rs index 41879919f..d6b23a144 100644 --- a/crates/puffin-distribution/src/lib.rs +++ b/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; diff --git a/crates/puffin-installer/Cargo.toml b/crates/puffin-installer/Cargo.toml index 3005cd889..eb7c536a5 100644 --- a/crates/puffin-installer/Cargo.toml +++ b/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 } diff --git a/crates/puffin-normalize/Cargo.toml b/crates/puffin-normalize/Cargo.toml index f8daad7a3..a2c5765d3 100644 --- a/crates/puffin-normalize/Cargo.toml +++ b/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" } diff --git a/crates/puffin-package/src/lib.rs b/crates/puffin-package/src/lib.rs deleted file mode 100644 index 399ae6dd0..000000000 --- a/crates/puffin-package/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod pypi_types; -pub mod requirements_txt; diff --git a/crates/puffin-resolver/Cargo.toml b/crates/puffin-resolver/Cargo.toml index 23a864776..c3af190bc 100644 --- a/crates/puffin-resolver/Cargo.toml +++ b/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 } diff --git a/crates/puffin-resolver/src/distribution/cached_wheel.rs b/crates/puffin-resolver/src/distribution/cached_wheel.rs index 7036c3dce..e0f2b26a3 100644 --- a/crates/puffin-resolver/src/distribution/cached_wheel.rs +++ b/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)] diff --git a/crates/puffin-resolver/src/distribution/source_distribution.rs b/crates/puffin-resolver/src/distribution/source_distribution.rs index 113e3f78d..adb858dd9 100644 --- a/crates/puffin-resolver/src/distribution/source_distribution.rs +++ b/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; diff --git a/crates/puffin-resolver/src/distribution/wheel.rs b/crates/puffin-resolver/src/distribution/wheel.rs index 1766ef297..8c7b2b369 100644 --- a/crates/puffin-resolver/src/distribution/wheel.rs +++ b/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; diff --git a/crates/puffin-resolver/src/file.rs b/crates/puffin-resolver/src/file.rs index ca8a11dff..dfbea37f3 100644 --- a/crates/puffin-resolver/src/file.rs +++ b/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)] diff --git a/crates/puffin-resolver/src/finder.rs b/crates/puffin-resolver/src/finder.rs index 384c63e6a..1745cc865 100644 --- a/crates/puffin-resolver/src/finder.rs +++ b/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; diff --git a/crates/puffin-resolver/src/resolution.rs b/crates/puffin-resolver/src/resolution.rs index 8a0862875..947c83ad2 100644 --- a/crates/puffin-resolver/src/resolution.rs +++ b/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}; diff --git a/crates/puffin-resolver/src/resolver.rs b/crates/puffin-resolver/src/resolver.rs index c860789c3..708e549c0 100644 --- a/crates/puffin-resolver/src/resolver.rs +++ b/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}; diff --git a/crates/pypi-types/Cargo.toml b/crates/pypi-types/Cargo.toml new file mode 100644 index 000000000..ce37e46dc --- /dev/null +++ b/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" } diff --git a/crates/puffin-package/src/pypi_types/mod.rs b/crates/pypi-types/src/lib.rs similarity index 100% rename from crates/puffin-package/src/pypi_types/mod.rs rename to crates/pypi-types/src/lib.rs diff --git a/crates/puffin-package/src/pypi_types/metadata.rs b/crates/pypi-types/src/metadata.rs similarity index 100% rename from crates/puffin-package/src/pypi_types/metadata.rs rename to crates/pypi-types/src/metadata.rs diff --git a/crates/puffin-package/src/pypi_types/simple_json.rs b/crates/pypi-types/src/simple_json.rs similarity index 100% rename from crates/puffin-package/src/pypi_types/simple_json.rs rename to crates/pypi-types/src/simple_json.rs diff --git a/crates/puffin-package/Cargo.toml b/crates/requirements-txt/Cargo.toml similarity index 68% rename from crates/puffin-package/Cargo.toml rename to crates/requirements-txt/Cargo.toml index 8f72e15df..084fb574a 100644 --- a/crates/puffin-package/Cargo.toml +++ b/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" } diff --git a/crates/puffin-package/src/requirements_txt.rs b/crates/requirements-txt/src/lib.rs similarity index 99% rename from crates/puffin-package/src/requirements_txt.rs rename to crates/requirements-txt/src/lib.rs index a45cd5c12..3c23446af 100644 --- a/crates/puffin-package/src/requirements_txt.rs +++ b/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"))] diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-basic.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap similarity index 99% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-basic.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-basic.txt.snap index dee1ed81a..b4523f89f 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-basic.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap similarity index 98% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-a.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-a.txt.snap index 57be605cf..e84e36b21 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-a.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap similarity index 97% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-b.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-constraints-b.txt.snap index 2929abb86..c05d9bd0b 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-constraints-b.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-empty.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-empty.txt.snap similarity index 62% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-empty.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-empty.txt.snap index 7ed4f9cba..b89cc12d4 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-empty.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-for-poetry.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap similarity index 98% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-for-poetry.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-for-poetry.txt.snap index c46ba1147..b1aaa4862 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-for-poetry.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap similarity index 96% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-a.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-a.txt.snap index 041e8c0c2..493846862 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-a.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap similarity index 88% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-b.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-include-b.txt.snap index 24bc648b7..fb4520ffa 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-include-b.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-poetry-with-hashes.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap similarity index 99% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-poetry-with-hashes.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-poetry-with-hashes.txt.snap index dedf65566..f5b3286e4 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-poetry-with-hashes.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-small.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap similarity index 97% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-small.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-small.txt.snap index 5535453f5..786cf37e8 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-small.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-whitespace.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap similarity index 96% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-whitespace.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__line-endings-whitespace.txt.snap index 2f816172a..85cfe9702 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-whitespace.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-basic.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap similarity index 99% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-basic.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-basic.txt.snap index dee1ed81a..b4523f89f 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-basic.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap similarity index 98% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-a.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-a.txt.snap index 57be605cf..e84e36b21 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-a.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap similarity index 97% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-b.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-constraints-b.txt.snap index 2929abb86..c05d9bd0b 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-constraints-b.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-empty.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-empty.txt.snap similarity index 62% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-empty.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-empty.txt.snap index 7ed4f9cba..b89cc12d4 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-empty.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-for-poetry.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap similarity index 98% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-for-poetry.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-for-poetry.txt.snap index c46ba1147..b1aaa4862 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-for-poetry.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-a.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap similarity index 96% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-a.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-a.txt.snap index 041e8c0c2..493846862 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-a.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-b.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap similarity index 88% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-b.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-include-b.txt.snap index 24bc648b7..fb4520ffa 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-include-b.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-poetry-with-hashes.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap similarity index 99% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-poetry-with-hashes.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-poetry-with-hashes.txt.snap index dedf65566..f5b3286e4 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-poetry-with-hashes.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-small.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap similarity index 97% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-small.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-small.txt.snap index 5535453f5..786cf37e8 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__parse-small.txt.snap +++ b/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 { diff --git a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-whitespace.txt.snap b/crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap similarity index 96% rename from crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-whitespace.txt.snap rename to crates/requirements-txt/src/snapshots/requirements_txt__test__parse-whitespace.txt.snap index 2f816172a..85cfe9702 100644 --- a/crates/puffin-package/src/snapshots/puffin_package__requirements_txt__test__line-endings-whitespace.txt.snap +++ b/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 { diff --git a/crates/puffin-package/test-data/requirements-txt/basic.txt b/crates/requirements-txt/test-data/requirements-txt/basic.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/basic.txt rename to crates/requirements-txt/test-data/requirements-txt/basic.txt diff --git a/crates/puffin-package/test-data/requirements-txt/constraints-a.txt b/crates/requirements-txt/test-data/requirements-txt/constraints-a.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/constraints-a.txt rename to crates/requirements-txt/test-data/requirements-txt/constraints-a.txt diff --git a/crates/puffin-package/test-data/requirements-txt/constraints-b.txt b/crates/requirements-txt/test-data/requirements-txt/constraints-b.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/constraints-b.txt rename to crates/requirements-txt/test-data/requirements-txt/constraints-b.txt diff --git a/crates/puffin-package/test-data/requirements-txt/empty.txt b/crates/requirements-txt/test-data/requirements-txt/empty.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/empty.txt rename to crates/requirements-txt/test-data/requirements-txt/empty.txt diff --git a/crates/puffin-package/test-data/requirements-txt/for-poetry.txt b/crates/requirements-txt/test-data/requirements-txt/for-poetry.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/for-poetry.txt rename to crates/requirements-txt/test-data/requirements-txt/for-poetry.txt diff --git a/crates/puffin-package/test-data/requirements-txt/include-a.txt b/crates/requirements-txt/test-data/requirements-txt/include-a.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/include-a.txt rename to crates/requirements-txt/test-data/requirements-txt/include-a.txt diff --git a/crates/puffin-package/test-data/requirements-txt/include-b.txt b/crates/requirements-txt/test-data/requirements-txt/include-b.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/include-b.txt rename to crates/requirements-txt/test-data/requirements-txt/include-b.txt diff --git a/crates/puffin-package/test-data/requirements-txt/invalid-include b/crates/requirements-txt/test-data/requirements-txt/invalid-include similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/invalid-include rename to crates/requirements-txt/test-data/requirements-txt/invalid-include diff --git a/crates/puffin-package/test-data/requirements-txt/invalid-requirement b/crates/requirements-txt/test-data/requirements-txt/invalid-requirement similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/invalid-requirement rename to crates/requirements-txt/test-data/requirements-txt/invalid-requirement diff --git a/crates/puffin-package/test-data/requirements-txt/poetry-with-hashes.txt b/crates/requirements-txt/test-data/requirements-txt/poetry-with-hashes.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/poetry-with-hashes.txt rename to crates/requirements-txt/test-data/requirements-txt/poetry-with-hashes.txt diff --git a/crates/puffin-package/test-data/requirements-txt/small.txt b/crates/requirements-txt/test-data/requirements-txt/small.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/small.txt rename to crates/requirements-txt/test-data/requirements-txt/small.txt diff --git a/crates/puffin-package/test-data/requirements-txt/whitespace.txt b/crates/requirements-txt/test-data/requirements-txt/whitespace.txt similarity index 100% rename from crates/puffin-package/test-data/requirements-txt/whitespace.txt rename to crates/requirements-txt/test-data/requirements-txt/whitespace.txt