From 11b11d04a7661bbd870afd92b7f901c0d9fc190a Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Fri, 12 Jan 2024 08:57:00 -0500 Subject: [PATCH] Ignore installed version when determining wheel compatibility (#890) --- crates/puffin-resolver/src/python_requirement.rs | 5 ----- crates/puffin-resolver/src/version_map.rs | 4 +--- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/crates/puffin-resolver/src/python_requirement.rs b/crates/puffin-resolver/src/python_requirement.rs index 3a0c7f743..c1a26d50c 100644 --- a/crates/puffin-resolver/src/python_requirement.rs +++ b/crates/puffin-resolver/src/python_requirement.rs @@ -29,9 +29,4 @@ impl<'a> PythonRequirement<'a> { pub(crate) fn target(&self) -> &'a Version { self.target } - - /// Returns an iterator over the versions of Python to consider when resolving dependencies. - pub(crate) fn versions(&self) -> impl Iterator { - std::iter::once(self.installed).chain(std::iter::once(self.target)) - } } diff --git a/crates/puffin-resolver/src/version_map.rs b/crates/puffin-resolver/src/version_map.rs index b048453eb..2773d0d9f 100644 --- a/crates/puffin-resolver/src/version_map.rs +++ b/crates/puffin-resolver/src/version_map.rs @@ -78,9 +78,7 @@ impl VersionMap { file.requires_python .as_ref() .map_or(true, |requires_python| { - python_requirement - .versions() - .all(|version| requires_python.contains(version)) + requires_python.contains(python_requirement.target()) }) }); let dist = Dist::from_registry(