mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Resolve non-determistic behavior in preferences due to site-packages ordering (#2780)

Browse source 
Originally a regression test for #2779 but we found out that there's
some weird behavior where different `anyio` versions were preferred
based on the platform.
This commit is contained in:
Zanie Blue 2024-04-02 13:48:33 -05:00 • committed by GitHub
parent 119d753cfe
commit 1ac9672b95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 60 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/uv-installer/src/site_packages.rs
View file

@ -46,7 +46,13 @@ impl<'a> SitePackages<'a> {
for site_packages in venv.site_packages() {
// Read the site-packages directory.
let site_packages = match fs::read_dir(site_packages) {
Ok(site_packages) => site_packages,
Ok(site_packages) => {
let mut entries = site_packages.collect::<Result<Vec<_>, std::io::Error>>()?;
// TODO(zanieb): Consider filtering to just directories to reduce the size of the sort
// Sort for determinism, `read_dir` is different per-platform
entries.sort_by_key(fs_err::DirEntry::path);
entries
}
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
return Ok(Self {
venv,
@ -60,7 +66,6 @@ impl<'a> SitePackages<'a> {
// Index all installed packages by name.
for entry in site_packages {
let entry = entry?;
if entry.file_type()?.is_dir() {
let path = entry.path();