Revert "Avoid panicking when encountering an invalid Python version during uv python list (#7131)"

This reverts commit 8eff8aa.

Author: zanieb

crates/uv-python/src/downloads.rs

@@ -529,9 +529,7 @@ impl ManagedPythonDownload {
     }
 
     pub fn python_version(&self) -> PythonVersion {
-        self.key
-            .version()
-            .expect("Managed Python downloads should always have valid versions")
+        self.key.version()
     }
 
     /// Return the [`Url`] to use when downloading the distribution. If a mirror is set via the

crates/uv-python/src/installation.rs

@@ -244,7 +244,7 @@ impl PythonInstallationKey {
 
     pub fn new_from_version(
         implementation: LenientImplementationName,
-        version: PythonVersion,
+        version: &PythonVersion,
         os: Os,
         arch: Arch,
         libc: Libc,
@@ -270,7 +270,7 @@ impl PythonInstallationKey {
             "{}.{}.{}{}",
             self.major, self.minor, self.patch, self.prerelease
         ))
-        .expect("Python versions for installation keys should always be valid}")
+        .expect("Python installation keys must have valid Python versions")
     }
 
     pub fn arch(&self) -> &Arch {
@@ -341,7 +341,7 @@ impl FromStr for PythonInstallationKey {
 
         Ok(Self::new_from_version(
             implementation,
-            version,
+            &version,
             os,
             arch,
             libc,
@@ -359,12 +359,7 @@ impl Ord for PythonInstallationKey {
     fn cmp(&self, other: &Self) -> std::cmp::Ordering {
         self.implementation
             .cmp(&other.implementation)
-            .then_with(|| {
-                self.major
-                    .cmp(&other.major)
-                    .then_with(|| self.minor.cmp(&other.minor))
-                    .then_with(|| self.patch.cmp(&other.patch))
-            })
+            .then_with(|| self.version().cmp(&other.version()))
             .then_with(|| self.os.to_string().cmp(&other.os.to_string()))
             .then_with(|| self.arch.to_string().cmp(&other.arch.to_string()))
             .then_with(|| self.libc.to_string().cmp(&other.libc.to_string()))

crates/uv-python/src/managed.rs

@@ -282,9 +282,7 @@ impl ManagedPythonInstallation {
 
     /// The [`PythonVersion`] of the toolchain.
     pub fn version(&self) -> PythonVersion {
-        self.key
-            .version()
-            .expect("Managed Python installations should always have valid versions")
+        self.key.version()
     }
 
     pub fn implementation(&self) -> &ImplementationName {
@@ -331,17 +329,13 @@ impl ManagedPythonInstallation {
         let stdlib = if matches!(self.key.os, Os(target_lexicon::OperatingSystem::Windows)) {
             self.python_dir().join("Lib")
         } else {
-            let version = self
-                .key
-                .version()
-                .expect("Managed Python installations should always have valid versions");
             let python = if matches!(
                 self.key.implementation,
                 LenientImplementationName::Known(ImplementationName::PyPy)
             ) {
-                format!("pypy{}", version.python_version())
+                format!("pypy{}", self.key.version().python_version())
             } else {
-                format!("python{}", version.python_version())
+                format!("python{}", self.key.version().python_version())
             };
             self.python_dir().join("lib").join(python)
         };

crates/uv/src/commands/python/install.rs

@@ -178,13 +178,7 @@ pub(crate) async fn install(
                 "{}",
                 format!(
                     "Installed {} {}",
-                    format!(
-                        "Python {}",
-                        installed.version().expect(
-                            "Managed Python installations should always have valid versions"
-                        )
-                    )
-                    .bold(),
+                    format!("Python {}", installed.version()).bold(),
                     format!("in {}", elapsed(start.elapsed())).dimmed()
                 )
                 .dimmed()

crates/uv/src/commands/python/list.rs

@@ -4,7 +4,6 @@ use std::fmt::Write;
 use anyhow::Result;
 use owo_colors::OwoColorize;
 use rustc_hash::FxHashSet;
-use tracing::warn;
 use uv_cache::Cache;
 use uv_fs::Simplified;
 use uv_python::downloads::PythonDownloadRequest;
@@ -107,17 +106,9 @@ pub(crate) async fn list(
             }
         }
 
-        let version = match key.version() {
-            Err(err) => {
-                warn!("Excluding {key} due to invalid Python version: {err}");
-                continue;
-            }
-            Ok(version) => version,
-        };
-
         // Only show the latest patch version for each download unless all were requested
         if !matches!(kind, Kind::System) {
-            if let [major, minor, ..] = version.release() {
+            if let [major, minor, ..] = key.version().release() {
                 if !seen_minor.insert((
                     *key.os(),
                     *major,
@@ -131,7 +122,7 @@ pub(crate) async fn list(
                     }
                 }
             }
-            if let [major, minor, patch] = version.release() {
+            if let [major, minor, patch] = key.version().release() {
                 if !seen_patch.insert((
                     *key.os(),
                     *major,

crates/uv/src/commands/python/uninstall.rs

@@ -148,13 +148,7 @@ async fn do_uninstall(
                 "{}",
                 format!(
                     "Uninstalled {} {}",
-                    format!(
-                        "Python {}",
-                        uninstalled.version().expect(
-                            "Managed Python installations should always have valid versions"
-                        )
-                    )
-                    .bold(),
+                    format!("Python {}", uninstalled.version()).bold(),
                     format!("in {}", elapsed(start.elapsed())).dimmed()
                 )
                 .dimmed()