Merge branch 'main' into quantco

prefix-dev · Jul 2, 2024 · dc87161 · dc87161
2 parents 49dff81 + bce5b57
commit dc87161
Show file tree

Hide file tree

Showing 9 changed files with 737 additions and 549 deletions.
diff --git a/pixi.lock b/pixi.lock
diff --git a/src/cli/task.rs b/src/cli/task.rs
@@ -275,9 +275,7 @@ fn get_tasks_per_env(
     let mut tasks_per_env: HashMap<Environment, HashMap<TaskName, Task>> = HashMap::new();
     for env in environments {
         let mut tasks: HashMap<TaskName, Task> = HashMap::new();
-        let this_env_tasks = env
-            .tasks(Some(env.best_platform()))
-            .expect("error getting tasks");
+        let this_env_tasks = env.tasks(Some(env.best_platform())).unwrap_or_default();
         for taskname in task_list.iter() {
             // if the task is in the environment, add it to the list
             if let Some(&task) = this_env_tasks.get(taskname) {

diff --git a/src/install_pypi.rs b/src/install_pypi.rs
@@ -660,7 +660,7 @@ async fn resolve_editables(
                 if ArchiveTimestamp::up_to_date_with(&editable.path, ArchiveTarget::Install(dist))
                     .into_diagnostic()?
                     // If the editable is dynamic, we need to rebuild it
-                    && !uv_installer::is_dynamic(dist.path())
+                    && !uv_installer::is_dynamic(&editable.path)
                     // And the dist is already editable
                     && dist.is_editable()
                 {

diff --git a/...s/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap b/...s/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-64.snap
@@ -1,6 +1,5 @@
 ---
 source: src/project/virtual_packages.rs
-assertion_line: 226
 expression: packages
 ---
 [
@@ -32,7 +31,7 @@ expression: packages
             source: "__glibc",
         },
         version: Version {
-            version: [[0], [2], [17]],
+            version: [[0], [2], [28]],
             local: [],
         },
         build_string: "0",

diff --git a/...i__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap b/...i__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-aarch64.snap
@@ -31,7 +31,7 @@ expression: packages
             source: "__glibc",
         },
         version: Version {
-            version: [[0], [2], [17]],
+            version: [[0], [2], [28]],
             local: [],
         },
         build_string: "0",

diff --git a/...i__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap b/...i__project__virtual_packages__tests__test_get_minimal_virtual_packages.linux-ppc64le.snap
@@ -31,7 +31,7 @@ expression: packages
             source: "__glibc",
         },
         version: Version {
-            version: [[0], [2], [17]],
+            version: [[0], [2], [28]],
             local: [],
         },
         build_string: "0",

diff --git a/...ots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap b/...ots/pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-64.snap
@@ -20,7 +20,7 @@ expression: packages
             source: "__osx",
         },
         version: Version {
-            version: [[0], [10], [15]],
+            version: [[0], [13], [0]],
             local: [],
         },
         build_string: "0",

diff --git a/.../pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap b/.../pixi__project__virtual_packages__tests__test_get_minimal_virtual_packages.osx-arm64.snap
@@ -20,7 +20,7 @@ expression: packages
             source: "__osx",
         },
         version: Version {
-            version: [[0], [11], [0]],
+            version: [[0], [13], [0]],
             local: [],
         },
         build_string: "0",

diff --git a/src/project/virtual_packages.rs b/src/project/virtual_packages.rs
@@ -15,7 +15,7 @@ use thiserror::Error;
 
 /// The default GLIBC version to use. This is used when no system requirements are specified.
 pub fn default_glibc_version() -> Version {
-    "2.17".parse().unwrap()
+    "2.28".parse().unwrap()
 }
 
 /// The default linux version to use. This is used when no system requirements are specified.
@@ -27,8 +27,8 @@ pub fn default_linux_version() -> Version {
 /// MacOS platform.
 pub fn default_mac_os_version(platform: Platform) -> Version {
     match platform {
-        Platform::OsxArm64 => "11.0".parse().unwrap(),
-        Platform::Osx64 => "10.15".parse().unwrap(),
+        Platform::OsxArm64 => "13.0".parse().unwrap(),
+        Platform::Osx64 => "13.0".parse().unwrap(),
         _ => panic!(
             "default_mac_os_version() called with non-osx platform: {}",
             platform