From 78bf83d9496d6a828b1e381692f325856ebe38dd Mon Sep 17 00:00:00 2001
From: Tim Hatch <timhatch@netflix.com>
Date: Wed, 16 Oct 2024 15:18:40 -0700
Subject: [PATCH 1/2] Narrow what the pip3.<minor> logic drops from entry
 points.

The hack in pip itself only modifies entry points called `pip<number>.<number>`
and `easy_install-<number>.<number>`, uv previously dropped too many items
including any of the form `foo.<number>`.

Found while trying to install `memray` which somewhat notably does not provide
an abi3 wheel, so the installed, suffixed script matches.  At a minimum, this
makes the installed files match the `entry_points.txt` more than it did
previously, which makes `pickley` happy.
---
 crates/uv-install-wheel/src/script.rs | 76 +++++++++++++++++++++++++--
 1 file changed, 73 insertions(+), 3 deletions(-)

diff --git a/crates/uv-install-wheel/src/script.rs b/crates/uv-install-wheel/src/script.rs
index 34039ad2cf0fb..da17c53a6f3a7 100644
--- a/crates/uv-install-wheel/src/script.rs
+++ b/crates/uv-install-wheel/src/script.rs
@@ -8,7 +8,7 @@ use crate::{wheel, Error};
 
 /// A script defining the name of the runnable entrypoint and the module and function that should be
 /// run.
-#[derive(Clone, Debug, Eq, PartialEq, Serialize)]
+#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize)]
 pub(crate) struct Script {
     pub(crate) name: String,
     pub(crate) module: String,
@@ -94,7 +94,7 @@ pub(crate) fn scripts_from_ini(
         let Some((left, right)) = script.name.split_once('.') else {
             return true;
         };
-        !(left == "pip3" || right.parse::<u8>().is_ok())
+        !(left == "pip3" && right.parse::<u8>().is_ok())
     });
     // ... either has a `pip3` launcher we can use as template for the `pip3.x` users expect.
     if let Some(pip_script) = console_scripts.iter().find(|script| script.name == "pip3") {
@@ -109,7 +109,7 @@ pub(crate) fn scripts_from_ini(
 
 #[cfg(test)]
 mod test {
-    use crate::script::Script;
+    use crate::script::{scripts_from_ini, Script};
 
     #[test]
     fn test_valid_script_names() {
@@ -148,4 +148,74 @@ mod test {
         assert_eq!(script.function, "mod_bar.sub_foo.func_baz");
         assert_eq!(script.import_name(), "mod_bar");
     }
+
+    #[test]
+    fn test_pip3_entry_point_modification() {
+        // Notably pip only applies the modification hack to entry points
+        // called "pip" and "easy_install" -- if there are abi3 style wheels
+        // that contain other versioned entry points, they keep their (probably
+        // incorrect) suffixes.
+        let sample_ini = "
+[console_scripts]
+pip = a:b1
+pip3 = a:b2
+pip3.11 = a:b3
+pip3.x = a:b4
+pip4.11 = a:b5
+memray = a:b6
+memray3.11 = a:b7
+";
+        let (mut console_scripts, _gui_scripts) =
+            scripts_from_ini(None, 99, sample_ini.to_string()).unwrap();
+        console_scripts.sort();
+
+        assert_eq!(
+            Some(&Script {
+                name: "memray".to_string(),
+                module: "a".to_string(),
+                function: "b6".to_string()
+            }),
+            console_scripts.get(0)
+        );
+        assert_eq!(
+            Some(&Script {
+                name: "memray3.11".to_string(),
+                module: "a".to_string(),
+                function: "b7".to_string()
+            }),
+            console_scripts.get(1)
+        );
+        assert_eq!(
+            Some(&Script {
+                name: "pip".to_string(),
+                module: "a".to_string(),
+                function: "b1".to_string()
+            }),
+            console_scripts.get(2)
+        );
+        assert_eq!(
+            Some(&Script {
+                name: "pip3".to_string(),
+                module: "a".to_string(),
+                function: "b2".to_string()
+            }),
+            console_scripts.get(3)
+        );
+        assert_eq!(
+            Some(&Script {
+                name: "pip3.99".to_string(),
+                module: "a".to_string(),
+                function: "b2".to_string()
+            }),
+            console_scripts.get(4)
+        );
+        assert_eq!(
+            Some(&Script {
+                name: "pip3.x".to_string(),
+                module: "a".to_string(),
+                function: "b4".to_string()
+            }),
+            console_scripts.get(5)
+        );
+    }
 }

From 9a34aa00f3e84a6e2d7fcea92a2e9c067b24b452 Mon Sep 17 00:00:00 2001
From: Tim Hatch <timhatch@netflix.com>
Date: Wed, 16 Oct 2024 15:51:30 -0700
Subject: [PATCH 2/2] Make clippy happy with some code that asserts a vector
 contents

---
 crates/uv-install-wheel/src/script.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/uv-install-wheel/src/script.rs b/crates/uv-install-wheel/src/script.rs
index da17c53a6f3a7..cc4dbc26fb6c4 100644
--- a/crates/uv-install-wheel/src/script.rs
+++ b/crates/uv-install-wheel/src/script.rs
@@ -175,7 +175,7 @@ memray3.11 = a:b7
                 module: "a".to_string(),
                 function: "b6".to_string()
             }),
-            console_scripts.get(0)
+            console_scripts.first()
         );
         assert_eq!(
             Some(&Script {