Skip to content

Commit 4f47dbe

Browse files
mrswastik-robotmrswastik-robot
authored
Merge branch 'main' into activation-scripts_in_a_sandbox
2 parents 9f15d00 + c01c460 commit 4f47dbe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1532
-377
lines changed

‎Cargo.lock

+52-47
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎crates/rattler-bin/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ clap = { workspace = true, features = ["derive"] }
2727
console = { workspace = true, features = ["windows-console-colors"] }
2828
indicatif = { workspace = true }
2929
once_cell = { workspace = true }
30-
rattler = { path="../rattler", version = "0.32.4", default-features = false, features = ["indicatif"] }
31-
rattler_conda_types = { path="../rattler_conda_types", version = "0.31.3", default-features = false }
32-
rattler_networking = { path="../rattler_networking", version = "0.22.8", default-features = false, features = ["gcs", "s3"] }
33-
rattler_repodata_gateway = { path="../rattler_repodata_gateway", version = "0.22.0", default-features = false, features = ["gateway"] }
34-
rattler_solve = { path="../rattler_solve", version = "1.4.0", default-features = false, features = ["resolvo", "libsolv_c"] }
35-
rattler_virtual_packages = { path="../rattler_virtual_packages", version = "2.0.6", default-features = false }
36-
rattler_cache = { path="../rattler_cache", version = "0.3.13", default-features = false }
37-
rattler_menuinst = { path="../rattler_menuinst", version = "0.2.2", default-features = false }
30+
rattler = { path="../rattler", version = "0.33.0", default-features = false, features = ["indicatif"] }
31+
rattler_conda_types = { path="../rattler_conda_types", version = "0.31.4", default-features = false }
32+
rattler_networking = { path="../rattler_networking", version = "0.22.9", default-features = false, features = ["gcs", "s3"] }
33+
rattler_repodata_gateway = { path="../rattler_repodata_gateway", version = "0.22.1", default-features = false, features = ["gateway"] }
34+
rattler_solve = { path="../rattler_solve", version = "1.4.1", default-features = false, features = ["resolvo", "libsolv_c"] }
35+
rattler_virtual_packages = { path="../rattler_virtual_packages", version = "2.0.7", default-features = false }
36+
rattler_cache = { path="../rattler_cache", version = "0.3.14", default-features = false }
37+
rattler_menuinst = { path="../rattler_menuinst", version = "0.2.3", default-features = false }
3838
reqwest = { workspace = true }
3939
reqwest-middleware = { workspace = true }
4040
tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

‎crates/rattler/CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [0.33.0](https://github.com/conda/rattler/compare/rattler-v0.32.4...rattler-v0.33.0) - 2025-03-10
10+
11+
### Added
12+
13+
- add reinstallation method to installer and transaction ([#1128](https://github.com/conda/rattler/pull/1128))
14+
915
## [0.32.4](https://github.com/conda/rattler/compare/rattler-v0.32.3...rattler-v0.32.4) - 2025-03-04
1016

1117
### Other

‎crates/rattler/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rattler"
3-
version = "0.32.4"
3+
version = "0.33.0"
44
edition.workspace = true
55
authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
66
description = "Rust library to install conda environments"
@@ -32,13 +32,13 @@ memchr = { workspace = true }
3232
memmap2 = { workspace = true }
3333
once_cell = { workspace = true }
3434
parking_lot = { workspace = true }
35-
rattler_cache = { path = "../rattler_cache", version = "0.3.13", default-features = false }
36-
rattler_conda_types = { path = "../rattler_conda_types", version = "0.31.3", default-features = false }
37-
rattler_digest = { path = "../rattler_digest", version = "1.0.7", default-features = false }
38-
rattler_networking = { path = "../rattler_networking", version = "0.22.8", default-features = false }
39-
rattler_shell = { path = "../rattler_shell", version = "0.22.22", default-features = false }
40-
rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.32", default-features = false, features = ["reqwest"] }
41-
rattler_menuinst = { path = "../rattler_menuinst", version = "0.2.2", default-features = false }
35+
rattler_cache = { path = "../rattler_cache", version = "0.3.14", default-features = false }
36+
rattler_conda_types = { path = "../rattler_conda_types", version = "0.31.4", default-features = false }
37+
rattler_digest = { path = "../rattler_digest", version = "1.0.8", default-features = false }
38+
rattler_networking = { path = "../rattler_networking", version = "0.22.9", default-features = false }
39+
rattler_shell = { path = "../rattler_shell", version = "0.22.23", default-features = false }
40+
rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.33", default-features = false, features = ["reqwest"] }
41+
rattler_menuinst = { path = "../rattler_menuinst", version = "0.2.3", default-features = false }
4242
rayon = { workspace = true }
4343
reflink-copy = { workspace = true }
4444
regex = { workspace = true }

0 commit comments

Comments
 (0)