Merge branch 'main' into relocatable

crates/install-wheel-rs/Cargo.toml

@@ -33,7 +33,6 @@ configparser = { workspace = true }
 csv = { workspace = true }
 data-encoding = { workspace = true }
 fs-err = { workspace = true }
-mailparse = { workspace = true }
 pathdiff = { workspace = true }
 platform-info = { workspace = true }
 reflink-copy = { workspace = true }

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

@@ -2,28 +2,25 @@
 //! reading from a zip file.
 
 use std::path::{Path, PathBuf};
-use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 use std::time::SystemTime;
 
 use distribution_filename::WheelFilename;
 use fs_err as fs;
 use fs_err::{DirEntry, File};
-use pep440_rs::Version;
-use pypi_types::DirectUrl;
+use pypi_types::{DirectUrl, Metadata12};
 use reflink_copy as reflink;
 use rustc_hash::FxHashMap;
 use serde::{Deserialize, Serialize};
 use tempfile::tempdir_in;
 use tracing::{debug, instrument};
-use uv_normalize::PackageName;
 use uv_warnings::warn_user_once;
 use walkdir::WalkDir;
 
 use crate::script::{scripts_from_ini, Script};
 use crate::wheel::{
-    extra_dist_info, install_data, parse_metadata, parse_wheel_file, read_record_file,
-    write_script_entrypoints, LibKind,
+    extra_dist_info, install_data, parse_wheel_file, read_record_file, write_script_entrypoints,
+    LibKind,
 };
 use crate::{Error, Layout};
 
@@ -50,16 +47,15 @@ pub fn install_wheel(
 ) -> Result<(), Error> {
     let dist_info_prefix = find_dist_info(&wheel)?;
     let metadata = dist_info_metadata(&dist_info_prefix, &wheel)?;
-    let (name, version) = parse_metadata(&dist_info_prefix, &metadata)?;
+    let Metadata12 { name, version, .. } = Metadata12::parse_metadata(&metadata)
+        .map_err(|err| Error::InvalidWheel(err.to_string()))?;
 
     // Validate the wheel name and version.
     {
-        let name = PackageName::from_str(&name)?;
         if name != filename.name {
             return Err(Error::MismatchedName(name, filename.name.clone()));
         }
 
-        let version = Version::from_str(&version)?;
         if version != filename.version && version != filename.version.clone().without_local() {
             return Err(Error::MismatchedVersion(version, filename.version.clone()));
         }
@@ -77,13 +73,13 @@ pub fn install_wheel(
 
     // > 1.c If Root-Is-Purelib == ‘true’, unpack archive into purelib (site-packages).
     // > 1.d Else unpack archive into platlib (site-packages).
-    debug!(name, "Extracting file");
+    debug!(?name, "Extracting file");
     let site_packages = match lib_kind {
         LibKind::Pure => &layout.scheme.purelib,
         LibKind::Plat => &layout.scheme.platlib,
     };
     let num_unpacked = link_mode.link_wheel_files(site_packages, &wheel, locks)?;
-    debug!(name, "Extracted {num_unpacked} files");
+    debug!(?name, "Extracted {num_unpacked} files");
 
     // Read the RECORD file.
     let mut record_file = File::open(
@@ -97,9 +93,9 @@ pub fn install_wheel(
         parse_scripts(&wheel, &dist_info_prefix, None, layout.python_version.1)?;
 
     if console_scripts.is_empty() && gui_scripts.is_empty() {
-        debug!(name, "No entrypoints");
+        debug!(?name, "No entrypoints");
     } else {
-        debug!(name, "Writing entrypoints");
+        debug!(?name, "Writing entrypoints");
 
         fs_err::create_dir_all(&layout.scheme.scripts)?;
         write_script_entrypoints(
@@ -124,7 +120,7 @@ pub fn install_wheel(
     // 2.b Move each subtree of distribution-1.0.data/ onto its destination path. Each subdirectory of distribution-1.0.data/ is a key into a dict of destination directories, such as distribution-1.0.data/(purelib|platlib|headers|scripts|data). The initially supported paths are taken from distutils.command.install.
     let data_dir = site_packages.join(format!("{dist_info_prefix}.data"));
     if data_dir.is_dir() {
-        debug!(name, "Installing data");
+        debug!(?name, "Installing data");
         install_data(
             layout,
             site_packages,
@@ -140,10 +136,10 @@ pub fn install_wheel(
         // 2.e Remove empty distribution-1.0.data directory.
         fs::remove_dir_all(data_dir)?;
     } else {
-        debug!(name, "No data");
+        debug!(?name, "No data");
     }
 
-    debug!(name, "Writing extra metadata");
+    debug!(?name, "Writing extra metadata");
     extra_dist_info(
         site_packages,
         &dist_info_prefix,
@@ -153,7 +149,7 @@ pub fn install_wheel(
         &mut record,
     )?;
 
-    debug!(name, "Writing record");
+    debug!(?name, "Writing record");
     let mut record_writer = csv::WriterBuilder::new()
         .has_headers(false)
         .escape(b'"')
@@ -278,6 +274,11 @@ impl LinkMode {
             Self::Symlink => symlink_wheel_files(site_packages, wheel, locks),
         }
     }
+
+    /// Returns `true` if the link mode is [`LinkMode::Symlink`].
+    pub fn is_symlink(&self) -> bool {
+        matches!(self, Self::Symlink)
+    }
 }
 
 /// Extract a wheel by cloning all of its files into site packages. The files will be cloned

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

@@ -11,36 +11,6 @@ use uv_normalize::PackageName;
 
 use crate::Error;
 
-/// Returns `true` if the file is a `METADATA` file in a `.dist-info` directory that matches the
-/// wheel filename.
-pub fn is_metadata_entry(path: &str, filename: &WheelFilename) -> bool {
-    let Some((dist_info_dir, file)) = path.split_once('/') else {
-        return false;
-    };
-    if file != "METADATA" {
-        return false;
-    }
-    let Some(dir_stem) = dist_info_dir.strip_suffix(".dist-info") else {
-        return false;
-    };
-    let Some((name, version)) = dir_stem.rsplit_once('-') else {
-        return false;
-    };
-    let Ok(name) = PackageName::from_str(name) else {
-        return false;
-    };
-    if name != filename.name {
-        return false;
-    }
-    let Ok(version) = Version::from_str(version) else {
-        return false;
-    };
-    if version != filename.version {
-        return false;
-    }
-    true
-}
-
 /// Find the `.dist-info` directory in a zipped wheel.
 ///
 /// Returns the dist info dir prefix without the `.dist-info` extension.

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

@@ -6,7 +6,6 @@ use std::{env, io};
 use data_encoding::BASE64URL_NOPAD;
 use fs_err as fs;
 use fs_err::{DirEntry, File};
-use mailparse::MailHeaderMap;
 use rustc_hash::FxHashMap;
 use sha2::{Digest, Sha256};
 use tracing::{instrument, warn};
@@ -16,6 +15,7 @@ use zip::ZipWriter;
 
 use pypi_types::DirectUrl;
 use uv_fs::{relative_to, Simplified};
+use uv_normalize::PackageName;
 
 use crate::record::RecordEntry;
 use crate::script::Script;
@@ -143,7 +143,7 @@ fn format_shebang(executable: impl AsRef<Path>, os_name: &str, is_relocatable: b
         // (note: the Windows trampoline binaries natively support relative paths to executable)
         if shebang_length > 127 || executable.contains(' ') || is_relocatable {
             let prefix = if is_relocatable {
-                r#""$(CDPATH= cd -- "$(dirname -- "$0")" && echo "$PWD")""#
+                r#""$(CDPATH= cd -- "$(dirname -- "$0")" && echo "$PWD")"/"#
             } else {
                 ""
             };
@@ -586,7 +586,7 @@ pub(crate) fn install_data(
     layout: &Layout,
     site_packages: &Path,
     data_dir: &Path,
-    dist_name: &str,
+    dist_name: &PackageName,
     console_scripts: &[Script],
     gui_scripts: &[Script],
     record: &mut [RecordEntry],
@@ -632,7 +632,7 @@ pub(crate) fn install_data(
                 }
             }
             Some("headers") => {
-                let target_path = layout.scheme.include.join(dist_name);
+                let target_path = layout.scheme.include.join(dist_name.as_str());
                 move_folder_recorded(&path, &target_path, site_packages, record)?;
             }
             Some("purelib") => {
@@ -757,49 +757,6 @@ fn parse_key_value_file(
     Ok(data)
 }
 
-/// Parse the distribution name and version from a wheel's `dist-info` metadata.
-///
-/// See: <https://github.com/PyO3/python-pkginfo-rs>
-pub(crate) fn parse_metadata(
-    dist_info_prefix: &str,
-    content: &[u8],
-) -> Result<(String, String), Error> {
-    // HACK: trick mailparse to parse as UTF-8 instead of ASCII
-    let mut mail = b"Content-Type: text/plain; charset=utf-8\n".to_vec();
-    mail.extend_from_slice(content);
-    let msg = mailparse::parse_mail(&mail).map_err(|err| {
-        Error::InvalidWheel(format!(
-            "Invalid metadata in {dist_info_prefix}.dist-info/METADATA: {err}"
-        ))
-    })?;
-    let headers = msg.get_headers();
-    let metadata_version =
-        headers
-            .get_first_value("Metadata-Version")
-            .ok_or(Error::InvalidWheel(format!(
-                "No `Metadata-Version` field in: {dist_info_prefix}.dist-info/METADATA"
-            )))?;
-    // Crude but it should do https://packaging.python.org/en/latest/specifications/core-metadata/#metadata-version
-    // At time of writing:
-    // > Version of the file format; legal values are “1.0”, “1.1”, “1.2”, “2.1”, “2.2”, and “2.3”.
-    if !(metadata_version.starts_with("1.") || metadata_version.starts_with("2.")) {
-        return Err(Error::InvalidWheel(format!(
-            "`Metadata-Version` field has unsupported value {metadata_version} in: {dist_info_prefix}.dist-info/METADATA"
-        )));
-    }
-    let name = headers
-        .get_first_value("Name")
-        .ok_or(Error::InvalidWheel(format!(
-            "No `Name` field in: {dist_info_prefix}.dist-info/METADATA"
-        )))?;
-    let version = headers
-        .get_first_value("Version")
-        .ok_or(Error::InvalidWheel(format!(
-            "No `Version` field in: {dist_info_prefix}.dist-info/METADATA"
-        )))?;
-    Ok((name, version))
-}
-
 #[cfg(test)]
 mod test {
     use std::io::Cursor;
@@ -936,7 +893,7 @@ mod test {
         let os_name = "posix";
         assert_eq!(
             format_shebang(executable, os_name, true),
-            "#!/bin/sh\n'''exec' \"$(CDPATH= cd -- \"$(dirname -- \"$0\")\" && echo \"$PWD\")\"'python3' \"$0\" \"$@\"\n' '''"
+            "#!/bin/sh\n'''exec' \"$(CDPATH= cd -- \"$(dirname -- \"$0\")\" && echo \"$PWD\")\"/'python3' \"$0\" \"$@\"\n' '''"
         );
 
         // Except on Windows...

crates/pep508-rs/src/lib.rs

@@ -551,11 +551,6 @@ impl Extras {
     pub fn parse<T: Pep508Url>(input: &str) -> Result<Self, Pep508Error<T>> {
         Ok(Self(parse_extras_cursor(&mut Cursor::new(input))?))
     }
-
-    /// Convert the [`Extras`] into a [`Vec`] of [`ExtraName`].
-    pub fn into_vec(self) -> Vec<ExtraName> {
-        self.0
-    }
 }
 
 /// The actual version specifier or URL to install.