Skip to content

Commit

Permalink
bump: rattler 0.14 (#580)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruben-arts authored Dec 19, 2023
1 parent e0103d5 commit ebe7f73
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 41 deletions.
70 changes: 41 additions & 29 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ minijinja = { version = "1.0.10", features = ["builtins"] }
once_cell = "1.18.0"
pep440_rs = "0.3.12"
pep508_rs = { version = "0.2.3", features = ["modern"] }
rattler = { version = "0.13.0", default-features = false }
rattler_conda_types = { version = "0.13.0", default-features = false }
rattler_digest = { version = "0.13.0", default-features = false }
rattler_lock = { version = "0.13.0", default-features = false }
rattler_networking = { version = "0.13.0", default-features = false }
rattler_repodata_gateway = { version = "0.13.0", default-features = false, features = ["sparse"] }
rattler_shell = { version = "0.13.0", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "0.13.0", default-features = false, features = ["resolvo"] }
rattler_virtual_packages = { version = "0.13.0", default-features = false }
rattler = { version = "0.14.0", default-features = false }
rattler_conda_types = { version = "0.14.0", default-features = false }
rattler_digest = { version = "0.14.0", default-features = false }
rattler_lock = { version = "0.14.0", default-features = false }
rattler_networking = { version = "0.14.0", default-features = false }
rattler_repodata_gateway = { version = "0.14.0", default-features = false, features = ["sparse"] }
rattler_shell = { version = "0.14.0", default-features = false, features = ["sysinfo"] }
rattler_solve = { version = "0.14.0", default-features = false, features = ["resolvo"] }
rattler_virtual_packages = { version = "0.14.0", default-features = false }
regex = "1.10.2"
reqwest = { version = "0.11.22", default-features = false }
rip = { package = "rattler_installs_packages", version = "0.1.0", default-features = false }
Expand All @@ -71,7 +71,7 @@ libc = { version = "0.2.150", default-features = false }
signal-hook = "0.3.17"

[dev-dependencies]
rattler_digest = "0.13.0"
rattler_digest = "0.14.0"
serde_json = "1.0.108"
serial_test = "2.0.0"
tokio = { version = "1.34.0", features = ["rt"] }
Expand Down
2 changes: 1 addition & 1 deletion src/cli/global/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ pub(crate) fn create_activation_script(
.activation(ActivationVariables {
conda_prefix: None,
path: None,
path_modification_behaviour: PathModificationBehavior::Prepend,
path_modification_behavior: PathModificationBehavior::Prepend,
})
.into_diagnostic()?;

Expand Down
2 changes: 1 addition & 1 deletion src/cli/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ async fn run_activation(
conda_prefix: None,

// Prepending environment paths so they get found first.
path_modification_behaviour: PathModificationBehavior::Prepend,
path_modification_behavior: PathModificationBehavior::Prepend,
})
})
.await
Expand Down

0 comments on commit ebe7f73

Please sign in to comment.