Factor out a resolver.

Cargo.toml

@@ -25,12 +25,15 @@ members = [
     "crates/platform",
     "crates/python-platform",
     "crates/python-proxy",
+    "crates/repackage",
     "crates/request",
+    "crates/resolver",
     "crates/scripts",
     "crates/target",
     "crates/testing",
     "crates/tools",
-    "crates/venv"
+    "crates/venv",
+    "crates/wheel"
 ]
 
 [package.metadata.build]
@@ -245,13 +248,17 @@ interpreter = { path = "crates/interpreter" }
 itertools = { workspace = true }
 log = { workspace = true }
 logging = { path = "crates/logging" }
+logging_timer = { workspace = true }
 owo-colors = { workspace = true }
+pep508_rs = { workspace = true }
 pex = { path = "crates/pex" }
 platform = { path = "crates/platform" }
 python-platform = { path = "crates/python-platform" }
 python-proxy = { path = "crates/python-proxy" }
 rayon = { workspace = true }
 request = { path = "crates/request" }
+repackage = { path = "crates/repackage" }
+resolver = { path = "crates/resolver" }
 scripts = { path = "crates/scripts", features = ["embedded"] }
 serde_json = { workspace = true }
 sha2 = { workspace = true }
@@ -260,5 +267,6 @@ target = { path = "crates/target" }
 tempfile = { workspace = true }
 url = { workspace = true }
 walkdir = { workspace = true }
+wheel = { path = "crates/wheel" }
 zip = { workspace = true }
 zstd = { workspace = true }

crates/interpreter/Cargo.toml

@@ -25,6 +25,7 @@ serde_json = { workspace = true }
 tempfile = { workspace = true }
 time = { workspace = true }
 url = { workspace = true }
+wheel = { path = "../wheel" }
 which = { workspace = true }
 
 [target.'cfg(windows)'.dependencies]

crates/interpreter/src/lib.rs

@@ -14,7 +14,6 @@ mod interpreter;
 mod platform;
 mod pyenv;
 mod search_path;
-mod tag;
 mod version;
 
 pub use constraints::unix::calculate_compatible_binary_names as calculate_compatible_unix_binary_names;
@@ -27,5 +26,5 @@ pub use constraints::{
 pub use interpreter::{Interpreter, InterpreterDetails};
 pub use platform::Platform;
 pub use search_path::SearchPath;
-pub use tag::Tag;
 pub use version::{LATEST_STABLE, OLDEST_SUPPORTED_STABLE};
+pub use wheel::Tag;

crates/pex/Cargo.toml

@@ -26,6 +26,7 @@ python-pkginfo = { workspace = true }
 python-platform = { path = "../python-platform" }
 rayon = { workspace = true }
 regex = { workspace = true }
+resolver = { path = "../resolver" }
 rfc2047-decoder = { workspace = true }
 rust-ini = { workspace = true }
 scripts = { path = "../scripts" }
@@ -37,6 +38,7 @@ tempfile = { workspace = true }
 url = { workspace = true }
 version-ranges = { workspace = true }
 walkdir = { workspace = true }
+wheel = { path = "../wheel" }
 zip = { workspace = true }
 
 [dev-dependencies]

crates/pex/src/lib.rs

@@ -2,39 +2,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #![deny(clippy::all)]
-#![feature(str_as_str)]
 
-mod dependency_configuration;
 mod pex;
 mod pex_info;
 mod pex_path;
-mod wheel;
 
-pub use dependency_configuration::DependencyConfiguration;
 pub use pex::{
-    CollectWheelMetadata,
     Layout,
     Pex,
-    Resolve,
     ResolveError,
-    ResolvedWheel,
     ResolvedWheels,
     collect_loose_user_source,
     collect_zipped_user_source_indexes,
     filter_zipped_user_source,
 };
 pub use pex_info::{BinPath, InheritPath, InterpreterSelectionStrategy, PexInfo, RawPexInfo};
 pub use pex_path::PexPath;
-pub use wheel::{
-    EntryPoint,
-    EntryPoints,
-    MetadataDirs,
-    Record,
-    WheelDir,
-    WheelFile,
-    WheelLayout,
-    WheelMetadata,
-    WheelOptions,
-    recompress_zipped_whl,
-    repackage_wheels,
-};