fixes

astral-sh · Mar 27, 2024 · 5d79d5e · 5d79d5e
1 parent 2275dd2
commit 5d79d5e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/crates/uv-installer/src/site_packages.rs b/crates/uv-installer/src/site_packages.rs
@@ -67,10 +67,6 @@ impl<'a> SitePackages<'a> {
  };
 
  let idx = distributions.len();
-
- if by_name.get(dist_info.name()).is_some() {
- continue;
- }
  // Index the distribution by name.
  by_name
  .entry(dist_info.name().clone())
@@ -79,9 +75,6 @@ impl<'a> SitePackages<'a> {
 
  // Index the distribution by URL.
  if let InstalledDist::Url(dist) = &dist_info {
- if by_url.get(&dist.url).is_some() {
- continue;
- }
  by_url
  .entry(dist.url.clone())
  .or_insert_with(Vec::new)

diff --git a/crates/uv-interpreter/src/interpreter.rs b/crates/uv-interpreter/src/interpreter.rs
@@ -588,6 +588,7 @@ mod tests {
  "base_prefix": "/home/ferris/.pyenv/versions/3.12.0",
  "prefix": "/home/ferris/projects/uv/.venv",
  "sys_executable": "/home/ferris/projects/uv/.venv/bin/python",
+ "sys_path": [],
  "stdlib": "/home/ferris/.pyenv/versions/3.12.0/lib/python3.12",
  "scheme": {
  "data": "/home/ferris/.pyenv/versions/3.12.0",

diff --git a/crates/uv-interpreter/src/python_environment.rs b/crates/uv-interpreter/src/python_environment.rs
@@ -96,7 +96,13 @@ impl PythonEnvironment {
  let mut site_packages = Vec::new();
  site_packages.push(self.interpreter.purelib());
  site_packages.push(self.interpreter.platlib());
- site_packages.extend(self.interpreter.sys_path());
+ site_packages.extend(
+ self.interpreter
+ .sys_path()
+ .iter()
+ .filter(|path| path.ends_with("site-packages") || path.ends_with("dist-packages")),
+ );
+ site_packages.sort();
  site_packages.dedup();
  site_packages.into_iter()
  }