diff --git a/crates/rattler/src/install/transaction.rs b/crates/rattler/src/install/transaction.rs index e3ae90703..2cf03e0a6 100644 --- a/crates/rattler/src/install/transaction.rs +++ b/crates/rattler/src/install/transaction.rs @@ -69,6 +69,10 @@ pub struct Transaction { /// The python version of the target state, or None if python doesnt exist in the environment. pub python_info: Option, + /// The python version of the current state, or None if python didnt exist in the previous + /// environment. + pub current_python_info: Option, + /// The target platform of the transaction pub platform: Platform, } @@ -147,6 +151,7 @@ impl, New: AsRef> Transaction Ok(Self { operations, python_info: desired_python_info, + current_python_info, platform, }) } diff --git a/crates/rattler_solve/tests/backends.rs b/crates/rattler_solve/tests/backends.rs index 98314768c..5c56ab4ab 100644 --- a/crates/rattler_solve/tests/backends.rs +++ b/crates/rattler_solve/tests/backends.rs @@ -173,7 +173,7 @@ macro_rules! solver_backend_tests { insta::assert_yaml_snapshot!(solve_real_world::<$T>(vec!["xtensor", "xsimd",])); } - #[test_log::test] + #[test] fn test_solve_tensorflow() { insta::assert_yaml_snapshot!(solve_real_world::<$T>(vec!["tensorflow"])); } diff --git a/crates/rattler_solve/tests/snapshots/backends__libsolv_c__impl.snap b/crates/rattler_solve/tests/snapshots/backends__libsolv_c__solve_tensorflow.snap similarity index 100% rename from crates/rattler_solve/tests/snapshots/backends__libsolv_c__impl.snap rename to crates/rattler_solve/tests/snapshots/backends__libsolv_c__solve_tensorflow.snap diff --git a/crates/rattler_solve/tests/snapshots/backends__resolvo__impl.snap b/crates/rattler_solve/tests/snapshots/backends__resolvo__solve_tensorflow.snap similarity index 99% rename from crates/rattler_solve/tests/snapshots/backends__resolvo__impl.snap rename to crates/rattler_solve/tests/snapshots/backends__resolvo__solve_tensorflow.snap index 7392be21a..211ca9a49 100644 --- a/crates/rattler_solve/tests/snapshots/backends__resolvo__impl.snap +++ b/crates/rattler_solve/tests/snapshots/backends__resolvo__solve_tensorflow.snap @@ -1,6 +1,5 @@ --- source: crates/rattler_solve/tests/backends.rs -assertion_line: 530 expression: "solve_real_world::(vec![\"tensorflow\"])" --- - _libgcc_mutex 0.1 conda_forge