From df008aae56e1e3019b1ba2889195cf58d57136c7 Mon Sep 17 00:00:00 2001
From: Gabriel Smith <gabriel.smith@precisionot.com>
Date: Thu, 2 Jun 2022 19:19:29 -0400
Subject: [PATCH 1/2] Fix detection of Windows Store Python installs.

Some Windows versions refuse to see the Windows Store application
aliases unless you explicitly append the ".exe" extension.
---
 src/python_interpreter/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs
index 208b4530d..ba47f3e0c 100644
--- a/src/python_interpreter/mod.rs
+++ b/src/python_interpreter/mod.rs
@@ -230,7 +230,7 @@ fn find_all_windows(target: &Target, min_python_minor: usize) -> Result<Vec<Stri
     // Fallback to pythonX.Y for Microsoft Store versions
     for minor in min_python_minor..MAXIMUM_PYTHON_MINOR {
         if !versions_found.contains(&(3, minor)) {
-            interpreter.push(format!("python3.{}", minor));
+            interpreter.push(format!("python3.{}.exe", minor));
             versions_found.insert((3, minor));
         }
     }

From d922130f7d527a17afb09ba2b8a19b8fae9af65d Mon Sep 17 00:00:00 2001
From: Gabriel Smith <gabriel.smith@precisionot.com>
Date: Thu, 2 Jun 2022 19:28:24 -0400
Subject: [PATCH 2/2] Don't bail if we can't find the path for a version
 reported by py.exe

Some weird or broken installs can be reported by py.exe. We shouldn't
fail to run just because of these installs as others could exist that
work.
---
 src/python_interpreter/mod.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/python_interpreter/mod.rs b/src/python_interpreter/mod.rs
index ba47f3e0c..bac3f6265 100644
--- a/src/python_interpreter/mod.rs
+++ b/src/python_interpreter/mod.rs
@@ -144,7 +144,11 @@ fn find_all_windows(target: &Target, min_python_minor: usize) -> Result<Vec<Stri
                         .unwrap();
                     let path = str::from_utf8(&output.stdout).unwrap().trim();
                     if !output.status.success() || path.trim().is_empty() {
-                        bail!("Couldn't determine the path to python for `py {}`", version);
+                        eprintln!(
+                            "⚠️  Warning: couldn't determine the path to python for `py {}`",
+                            version
+                        );
+                        continue;
                     }
                     interpreter.push(path.to_string());
                     versions_found.insert((major, minor));