Merge remote-tracking branch 'upstream/main' into feature/basic-use-k…

…eyring
astral-sh · Mar 11, 2024 · 177bdee · 177bdee
2 parents 6123dfd + f70ae72
commit 177bdee
Show file tree

Hide file tree

Showing 34 changed files with 959 additions and 386 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## 0.1.17
+
+### Enhancements
+
+- Allow more-precise Git URLs to override less-precise Git URLs ([#2285](https://github.com/astral-sh/uv/pull/2285))
+- Add support for Metadata 2.2 ([#2293](https://github.com/astral-sh/uv/pull/2293))
+- Added ability to select bytecode invalidation mode of generated `.pyc` files ([#2297](https://github.com/astral-sh/uv/pull/2297))
+- Add `Seek` fallback for zip files with data descriptors ([#2320](https://github.com/astral-sh/uv/pull/2320))
+
+### Bug fixes
+
+- Support reading UTF-16 requirements files ([#2283](https://github.com/astral-sh/uv/pull/2283))
+- Trim rows in `pip list` ([#2298](https://github.com/astral-sh/uv/pull/2298))
+- Avoid using setuptools shim of distutils ([#2305](https://github.com/astral-sh/uv/pull/2305))
+- Communicate PEP 517 hook results via files ([#2314](https://github.com/astral-sh/uv/pull/2314))
+- Increase default buffer size for wheel and source downloads ([#2319](https://github.com/astral-sh/uv/pull/2319))
+- Add `Accept-Encoding: identity` to remaining stream paths ([#2321](https://github.com/astral-sh/uv/pull/2321))
+- Avoid duplicating authorization header with netrc ([#2325](https://github.com/astral-sh/uv/pull/2325))
+- Remove duplicate `INSTALLER` in `RECORD` ([#2336](https://github.com/astral-sh/uv/pull/2336))
+
+### Documentation
+
+- Add a custom suggestion to install wheel into the build environment ([#2307](https://github.com/astral-sh/uv/pull/2307))
+- Document the environment variables that uv respects ([#2318](https://github.com/astral-sh/uv/pull/2318))
+
 ## 0.1.16
 
 ### Enhancements

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -104,7 +104,7 @@ toml = { version = "0.8.8" }
 tracing = { version = "0.1.40" }
 tracing-durations-export = { version = "0.2.0", features = ["plot"] }
 tracing-indicatif = { version = "0.3.6" }
-tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter", "json"] }
 tracing-tree = { version = "0.3.0" }
 unicode-width = { version = "0.1.11" }
 unscanny = { version = "0.1.0" }

diff --git a/crates/install-wheel-rs/src/lib.rs b/crates/install-wheel-rs/src/lib.rs
@@ -1,16 +1,13 @@
 //! Takes a wheel and installs it into a venv.
 
 use std::io;
-use std::io::{Read, Seek};
+
 use std::path::PathBuf;
-use std::str::FromStr;
 
 use platform_info::PlatformInfoError;
 use thiserror::Error;
 use zip::result::ZipError;
-use zip::ZipArchive;
 
-use distribution_filename::WheelFilename;
 use pep440_rs::Version;
 use platform_host::{Arch, Os};
 use pypi_types::Scheme;
@@ -19,6 +16,7 @@ use uv_fs::Simplified;
 use uv_normalize::PackageName;
 
 pub mod linker;
+pub mod metadata;
 mod record;
 mod script;
 mod uninstall;
@@ -99,131 +97,3 @@ pub enum Error {
     #[error("Wheel version does not match filename: {0} != {1}")]
     MismatchedVersion(Version, Version),
 }
-
-/// 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 from a list of files.
-///
-/// The metadata name may be uppercase, while the wheel and dist info names are lowercase, or
-/// the metadata name and the dist info name are lowercase, while the wheel name is uppercase.
-/// Either way, we just search the wheel for the name.
-///
-/// Returns the dist info dir prefix without the `.dist-info` extension.
-///
-/// Reference implementation: <https://github.com/pypa/packaging/blob/2f83540272e79e3fe1f5d42abae8df0c14ddf4c2/src/packaging/utils.py#L146-L172>
-pub fn find_dist_info<'a, T: Copy>(
-    filename: &WheelFilename,
-    files: impl Iterator<Item = (T, &'a str)>,
-) -> Result<(T, &'a str), Error> {
-    let metadatas: Vec<_> = files
-        .filter_map(|(payload, path)| {
-            let (dist_info_dir, file) = path.split_once('/')?;
-            if file != "METADATA" {
-                return None;
-            }
-
-            let dir_stem = dist_info_dir.strip_suffix(".dist-info")?;
-            let (name, version) = dir_stem.rsplit_once('-')?;
-            if PackageName::from_str(name).ok()? != filename.name {
-                return None;
-            }
-
-            if Version::from_str(version).ok()? != filename.version {
-                return None;
-            }
-
-            Some((payload, dir_stem))
-        })
-        .collect();
-    let (payload, dist_info_prefix) = match metadatas[..] {
-        [] => {
-            return Err(Error::MissingDistInfo);
-        }
-        [(payload, path)] => (payload, path),
-        _ => {
-            return Err(Error::MultipleDistInfo(
-                metadatas
-                    .into_iter()
-                    .map(|(_, dist_info_dir)| dist_info_dir.to_string())
-                    .collect::<Vec<_>>()
-                    .join(", "),
-            ));
-        }
-    };
-    Ok((payload, dist_info_prefix))
-}
-
-/// Given an archive, read the `dist-info` metadata into a buffer.
-pub fn read_dist_info(
-    filename: &WheelFilename,
-    archive: &mut ZipArchive<impl Read + Seek + Sized>,
-) -> Result<Vec<u8>, Error> {
-    let dist_info_prefix =
-        find_dist_info(filename, archive.file_names().map(|name| (name, name)))?.1;
-
-    let mut file = archive
-        .by_name(&format!("{dist_info_prefix}.dist-info/METADATA"))
-        .map_err(|err| Error::Zip(filename.to_string(), err))?;
-
-    #[allow(clippy::cast_possible_truncation)]
-    let mut buffer = Vec::with_capacity(file.size() as usize);
-    file.read_to_end(&mut buffer)?;
-
-    Ok(buffer)
-}
-
-#[cfg(test)]
-mod test {
-    use std::str::FromStr;
-
-    use distribution_filename::WheelFilename;
-
-    use crate::find_dist_info;
-
-    #[test]
-    fn test_dot_in_name() {
-        let files = [
-            "mastodon/Mastodon.py",
-            "mastodon/__init__.py",
-            "mastodon/streaming.py",
-            "Mastodon.py-1.5.1.dist-info/DESCRIPTION.rst",
-            "Mastodon.py-1.5.1.dist-info/metadata.json",
-            "Mastodon.py-1.5.1.dist-info/top_level.txt",
-            "Mastodon.py-1.5.1.dist-info/WHEEL",
-            "Mastodon.py-1.5.1.dist-info/METADATA",
-            "Mastodon.py-1.5.1.dist-info/RECORD",
-        ];
-        let filename = WheelFilename::from_str("Mastodon.py-1.5.1-py2.py3-none-any.whl").unwrap();
-        let (_, dist_info_prefix) =
-            find_dist_info(&filename, files.into_iter().map(|file| (file, file))).unwrap();
-        assert_eq!(dist_info_prefix, "Mastodon.py-1.5.1");
-    }
-}