prefix-dev · ruben-arts · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024 · Jul 24, 2024
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -134,10 +134,12 @@ jobs:
         uses: rui314/setup-mold@v1
 
       - name: "Cargo nextest"
-        run: |
-          # we don't have anymore vendored openssl so we need to use rustls
-          cargo nextest run --retries 2 --status-level skip --failure-output immediate-final --no-fail-fast --final-status-level slow --no-default-features --features rustls-tls --features slow_integration_tests
-
+        run: >-
+          cargo nextest run
+          --workspace
+          --retries 2
+          --no-default-features --features rustls-tls --features slow_integration_tests
+          --status-level skip --failure-output immediate-final --no-fail-fast --final-status-level slow
 
   build:
     name: Build Binary | ${{ matrix.name }}

diff --git a/crates/pixi_manifest/src/manifest.rs b/crates/pixi_manifest/src/manifest.rs
@@ -581,7 +581,7 @@ impl Manifest {
     }
 
     /// Returns a mutable reference to the default feature.
-    fn default_feature_mut(&mut self) -> &mut Feature {
+    pub(crate) fn default_feature_mut(&mut self) -> &mut Feature {
         self.parsed.default_feature_mut()
     }
 
@@ -644,10 +644,12 @@ impl Manifest {
 
 #[cfg(test)]
 mod tests {
+    use indexmap::IndexMap;
     use std::str::FromStr;
 
-    use insta::{assert_snapshot, assert_yaml_snapshot};
+    use insta::assert_snapshot;
     use miette::NarratableReportHandler;
+    use rattler_conda_types::ParseStrictness::Strict;
     use rattler_conda_types::{Channel, ChannelConfig, ParseStrictness};
     use rattler_solve::ChannelPriority;
     use rstest::*;

diff --git a/crates/pixi_manifest/src/parsed_manifest.rs b/crates/pixi_manifest/src/parsed_manifest.rs
@@ -340,8 +340,17 @@ mod tests {
     use crate::parsed_manifest::ParsedManifest;
     use crate::TargetSelector;
     use insta::{assert_snapshot, assert_yaml_snapshot};
+    use itertools::Itertools;
     use rattler_conda_types::{Channel, Platform};
 
+    const PROJECT_BOILERPLATE: &str = r#"
+        [project]
+        name = "foo"
+        version = "0.1.0"
+        channels = []
+        platforms = []
+        "#;
+
     #[test]
     fn test_target_specific() {
         let contents = format!(

diff --git a/...est/src/snapshots/pixi__project__manifest__document__tests__get_or_insert_toml_table.snap b/...est/src/snapshots/pixi__project__manifest__document__tests__get_or_insert_toml_table.snap
diff --git a/...xi_manifest/src/snapshots/pixi__project__manifest__document__tests__nameless_to_toml.snap b/...xi_manifest/src/snapshots/pixi__project__manifest__document__tests__nameless_to_toml.snap
diff --git a/...c/snapshots/pixi__project__manifest__document__tests__test_add_environment_pixi.toml.snap b/...c/snapshots/pixi__project__manifest__document__tests__test_add_environment_pixi.toml.snap
diff --git a/...pshots/pixi__project__manifest__document__tests__test_add_environment_pyproject.toml.snap b/...pshots/pixi__project__manifest__document__tests__test_add_environment_pyproject.toml.snap
diff --git a/...napshots/pixi__project__manifest__document__tests__test_remove_environment_pixi.toml.snap b/...napshots/pixi__project__manifest__document__tests__test_remove_environment_pixi.toml.snap
diff --git a/...ots/pixi__project__manifest__document__tests__test_remove_environment_pyproject.toml.snap b/...ots/pixi__project__manifest__document__tests__test_remove_environment_pyproject.toml.snap
diff --git a/...anifest/src/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap b/...anifest/src/snapshots/pixi__project__manifest__pyproject__tests__add_pypi_dependency.snap
diff --git a/...fest/src/snapshots/pixi__project__manifest__pyproject__tests__remove_pypi_dependency.snap b/...fest/src/snapshots/pixi__project__manifest__pyproject__tests__remove_pypi_dependency.snap
diff --git a/...st/src/snapshots/pixi__project__manifest__system_requirements__tests__fam_misspelled.snap b/...st/src/snapshots/pixi__project__manifest__system_requirements__tests__fam_misspelled.snap
diff --git a/...st/src/snapshots/pixi__project__manifest__system_requirements__tests__lic_misspelled.snap b/...st/src/snapshots/pixi__project__manifest__system_requirements__tests__lic_misspelled.snap
diff --git a/...ifest/src/snapshots/pixi__project__manifest__system_requirements__tests__unknown_key.snap b/...ifest/src/snapshots/pixi__project__manifest__system_requirements__tests__unknown_key.snap
diff --git a/...rc/snapshots/pixi__project__manifest__system_requirements__tests__version_misspelled.snap b/...rc/snapshots/pixi__project__manifest__system_requirements__tests__version_misspelled.snap
diff --git a/..._manifest/src/snapshots/pixi__project__manifest__tests__pypi_options_default_feature.snap b/..._manifest/src/snapshots/pixi__project__manifest__tests__pypi_options_default_feature.snap
diff --git a/crates/pixi_manifest/src/snapshots/pixi__project__manifest__tests__python_dependencies.snap b/crates/pixi_manifest/src/snapshots/pixi__project__manifest__tests__python_dependencies.snap
diff --git a/...es/pixi_manifest/src/snapshots/pixi__project__manifest__tests__target_specific_tasks.snap b/...es/pixi_manifest/src/snapshots/pixi__project__manifest__tests__target_specific_tasks.snap
diff --git a/...oject__manifest__tests__add_channels.snap → ...ifest__manifest__tests__add_channels.snap b/...oject__manifest__tests__add_channels.snap → ...ifest__manifest__tests__add_channels.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]

diff --git a/...ect__manifest__tests__add_dependency.snap → ...est__manifest__tests__add_dependency.snap b/...ect__manifest__tests__add_dependency.snap → ...est__manifest__tests__add_dependency.snap
@@ -1,8 +1,7 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
-
 [project]
 name = "foo"
 channels = []
@@ -21,4 +20,3 @@ boef = ">=2.3"
 
 [feature.build.target.linux-64.build-dependencies]
 cmake = ">=2.3"
-
diff --git a/...__project__manifest__tests__add_task.snap → ..._manifest__manifest__tests__add_task.snap b/...__project__manifest__tests__add_task.snap → ..._manifest__manifest__tests__add_task.snap
@@ -1,8 +1,7 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
-
 [project]
 name = "foo"
 version = "0.1.0"
@@ -22,5 +21,3 @@ feature_test = "echo feature_test"
 
 [feature.test.target.linux-64.tasks]
 feature_test_target_linux = "echo feature_test_target_linux"
-
-
diff --git a/...ct__manifest__tests__test_remove_bar.snap → ...st__manifest__tests__test_remove_bar.snap b/...ct__manifest__tests__test_remove_bar.snap → ...st__manifest__tests__test_remove_bar.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
             [project]

diff --git a/...ct__manifest__tests__test_remove_baz.snap → ...st__manifest__tests__test_remove_baz.snap b/...ct__manifest__tests__test_remove_baz.snap → ...st__manifest__tests__test_remove_baz.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
             [project]

diff --git a/...t__manifest__tests__test_remove_fooz.snap → ...t__manifest__tests__test_remove_fooz.snap b/...t__manifest__tests__test_remove_fooz.snap → ...t__manifest__tests__test_remove_fooz.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
             [project]

diff --git a/..._tests__test_remove_pypi_feature_dep.snap → ..._tests__test_remove_pypi_feature_dep.snap b/..._tests__test_remove_pypi_feature_dep.snap → ..._tests__test_remove_pypi_feature_dep.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]

diff --git a/..._test_remove_pypi_feature_target_dep.snap → ..._test_remove_pypi_feature_target_dep.snap b/..._test_remove_pypi_feature_target_dep.snap → ..._test_remove_pypi_feature_target_dep.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]

diff --git a/...anifest__tests__test_remove_pypi_jax.snap → ...anifest__tests__test_remove_pypi_jax.snap b/...anifest__tests__test_remove_pypi_jax.snap → ...anifest__tests__test_remove_pypi_jax.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]
@@ -26,4 +26,3 @@ feature_dep = "*"
 
 [feature.test.target.linux-64.pypi-dependencies]
 feature_target_dep = "*"
-
diff --git a/...st__tests__test_remove_pypi_requests.snap → ...st__tests__test_remove_pypi_requests.snap b/...st__tests__test_remove_pypi_requests.snap → ...st__tests__test_remove_pypi_requests.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]

diff --git a/...st__tests__test_remove_pypi_xpackage.snap → ...st__tests__test_remove_pypi_xpackage.snap b/...st__tests__test_remove_pypi_xpackage.snap → ...st__tests__test_remove_pypi_xpackage.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/manifest.rs
 expression: manifest.document.to_string()
 ---
 [project]
@@ -26,4 +26,3 @@ feature_dep = "*"
 
 [feature.test.target.linux-64.pypi-dependencies]
 feature_target_dep = "*"
-
diff --git a/...roject__manifest__tests__invalid_key.snap → ..._parsed_manifest__tests__invalid_key.snap b/...roject__manifest__tests__invalid_key.snap → ..._parsed_manifest__tests__invalid_key.snap
@@ -1,6 +1,6 @@
 ---
-source: src/project/manifest/mod.rs
-expression: "examples.into_iter().map(|example|\n                ProjectManifest::from_toml_str(&example).unwrap_err().to_string()).collect::<Vec<_>>().join(\"\\n\")"
+source: crates/pixi_manifest/src/parsed_manifest.rs
+expression: "examples.into_iter().map(|example|\n                ParsedManifest::from_toml_str(&example).unwrap_err().to_string()).collect::<Vec<_>>().join(\"\\n\")"
 ---
 TOML parse error at line 8, column 2
   |

diff --git a/...fest__tests__invalid_target_specific.snap → ...fest__tests__invalid_target_specific.snap b/...fest__tests__invalid_target_specific.snap → ...fest__tests__invalid_target_specific.snap
@@ -1,6 +1,6 @@
 ---
-source: src/project/manifest/mod.rs
-expression: "examples.into_iter().map(|example|\n                ProjectManifest::from_toml_str(&format!(\"{PROJECT_BOILERPLATE}\\n{example}\")).unwrap_err().to_string()).collect::<Vec<_>>().join(\"\\n\")"
+source: crates/pixi_manifest/src/parsed_manifest.rs
+expression: "examples.into_iter().map(|example|\n                ParsedManifest::from_toml_str(&format!(\"{PROJECT_BOILERPLATE}\\n{example}\")).unwrap_err().to_string()).collect::<Vec<_>>().join(\"\\n\")"
 ---
 TOML parse error at line 8, column 9
   |

diff --git a/...st/src/snapshots/pixi_manifest__parsed_manifest__tests__pypi_options_default_feature.snap b/...st/src/snapshots/pixi_manifest__parsed_manifest__tests__pypi_options_default_feature.snap
@@ -0,0 +1,10 @@
+---
+source: crates/pixi_manifest/src/parsed_manifest.rs
+expression: "toml_edit::de::from_str::<ParsedManifest>(&contents).expect(\"parsing should succeed!\").project.pypi_options.clone().unwrap()"
+---
+index-url: "https://pypi.org/simple"
+extra-index-urls:
+  - "https://pypi.org/simple2"
+find-links:
+  - path: "../foo"
+  - url: "https://example.com/bar"
diff --git a/..._options_project_and_default_feature.snap → ..._options_project_and_default_feature.snap b/..._options_project_and_default_feature.snap → ..._options_project_and_default_feature.snap
@@ -1,5 +1,5 @@
 ---
-source: src/project/manifest/mod.rs
+source: crates/pixi_manifest/src/parsed_manifest.rs
 expression: manifest.project.pypi_options.clone().unwrap()
 ---
 index-url: ~

diff --git a/...xi_manifest/src/snapshots/pixi_manifest__parsed_manifest__tests__python_dependencies.snap b/...xi_manifest/src/snapshots/pixi_manifest__parsed_manifest__tests__python_dependencies.snap
@@ -0,0 +1,6 @@
+---
+source: crates/pixi_manifest/src/parsed_manifest.rs
+expression: "toml_edit::de::from_str::<ParsedManifest>(&contents).expect(\"parsing should succeed!\").default_feature().targets.default().pypi_dependencies.clone().into_iter().flat_map(|d|\n                d.into_iter()).map(|(name, spec)|\n            format!(\"{} = {}\", name.as_source(),\n                toml_edit::Value::from(spec))).join(\"\\n\")"
+---
+foo = ">=3.12"
+bar = { version = ">=3.12", extras = ["baz"] }
diff --git a/...nifest__tests__target_specific_tasks.snap → ...nifest__tests__target_specific_tasks.snap b/...nifest__tests__target_specific_tasks.snap → ...nifest__tests__target_specific_tasks.snap
@@ -1,6 +1,5 @@
 ---
-source: crates/pixi_manifest/src/lib.rs
-assertion_line: 1557
+source: crates/pixi_manifest/src/parsed_manifest.rs
 expression: "manifest.default_feature().targets.iter().flat_map(|(target, selector)|\n            {\n                let selector_name =\n                    selector.map_or_else(|| String::from(\"default\"),\n                        ToString::to_string);\n                target.tasks.iter().filter_map(move |(name, task)|\n                        {\n                            Some(format!(\"{}/{} = {}\", &selector_name, name.as_str(),\n                                    task.as_single_command()?))\n                        })\n            }).join(\"\\n\")"
 ---
 default/test = test multi