Escape rebase hell

crates/install-wheel-rs/src/lib.rs

@@ -2,18 +2,18 @@
 
 use std::io;
 
+use platform_host::{Arch, Os};
 use platform_info::PlatformInfoError;
 use thiserror::Error;
 use zip::result::ZipError;
 
 pub use install_location::{normalize_name, InstallLocation, LockedDir};
-use platform_host::{Arch, Os};
 pub use record::RecordEntry;
 pub use script::Script;
 pub use uninstall::{uninstall_wheel, Uninstall};
 pub use wheel::{
-    get_script_launcher, install_wheel, parse_key_value_file, read_record_file, relative_to,
-    SHEBANG_PYTHON,
+    find_dist_info, get_script_launcher, install_wheel, parse_key_value_file, read_record_file,
+    relative_to, SHEBANG_PYTHON,
 };
 
 mod install_location;

crates/install-wheel-rs/src/wheel.rs

@@ -1027,7 +1027,7 @@ pub fn install_wheel(
 /// Either way, we just search the wheel for the name
 ///
 /// <https://github.com/PyO3/python-pkginfo-rs>
-fn find_dist_info(
+pub fn find_dist_info(
     filename: &WheelFilename,
     archive: &mut ZipArchive<impl Read + Seek + Sized>,
 ) -> Result<String, Error> {

crates/puffin-build-cli/.gitignore

@@ -0,0 +1,2 @@
+downloads
+wheels

crates/puffin-build-cli/Cargo.toml

@@ -0,0 +1,37 @@
+[package]
+name = "puffin-build-cli"
+version = "0.0.1"
+description = "Build wheels from source distributions"
+edition = { workspace = true }
+rust-version = { workspace = true }
+homepage = { workspace = true }
+documentation = { workspace = true }
+repository = { workspace = true }
+authors = { workspace = true }
+license = { workspace = true }
+
+[dependencies]
+gourgeist = { path = "../gourgeist" }
+pep508_rs = { path = "../pep508-rs" }
+platform-host = { path = "../platform-host" }
+platform-tags = { path = "../platform-tags" }
+puffin-build = { path = "../puffin-build" }
+puffin-client = { path = "../puffin-client" }
+puffin-installer = { path = "../puffin-installer" }
+puffin-interpreter = { path = "../puffin-interpreter" }
+puffin-package = { path = "../puffin-package" }
+puffin-resolver = { path = "../puffin-resolver" }
+puffin-workspace = { path = "../puffin-workspace" }
+
+anyhow = { workspace = true }
+clap = { workspace = true, features = ["derive"] }
+directories = { workspace = true }
+fs-err = { workspace = true }
+futures = { workspace = true }
+itertools = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+which = { workspace = true }
+colored = "2.0.4"

crates/puffin-build-cli/src/lib.rs

@@ -0,0 +1,3 @@
+mod sdist;
+
+pub use sdist::resolve_and_install;

crates/puffin-build/src/main.rs → crates/puffin-build-cli/src/main.rs

@@ -1,5 +1,6 @@
 #![allow(clippy::print_stdout, clippy::print_stderr)]
 
+use crate::sdist::resolve_and_install;
 use anyhow::Context;
 use clap::Parser;
 use colored::Colorize;
@@ -16,6 +17,8 @@ use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::{fmt, EnvFilter};
 
+pub mod sdist;
+
 #[derive(Parser)]
 struct Args {
     /// Base python in a way that can be found with `which`
@@ -49,11 +52,16 @@ async fn run() -> anyhow::Result<()> {
     })?;
     let interpreter_info = gourgeist::get_interpreter_info(&base_python)?;
 
-    let builder =
-        SourceDistributionBuilder::setup(&args.sdist, &base_python, &interpreter_info, cache)
-            .await?;
+    let builder = SourceDistributionBuilder::setup(
+        &args.sdist,
+        &base_python,
+        &interpreter_info,
+        cache,
+        resolve_and_install,
+    )
+    .await?;
     let wheel = builder.build(&wheel_dir)?;
-    println!("Wheel built to {}", wheel.display());
+    println!("Wheel built to {}", wheel_dir.join(wheel).display());
     Ok(())
 }