py-rattler 0.7.0__tar.gz → 0.7.1__tar.gz

{py_rattler-0.7.0 → py_rattler-0.7.1}/Cargo.lock

@@ -2414,7 +2414,7 @@ dependencies = [
 
 [[package]]
 name = "py-rattler"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2634,7 +2634,7 @@ dependencies = [
 
 [[package]]
 name = "rattler"
-version = "0.27.11"
+version = "0.27.13"
 dependencies = [
  "anyhow",
  "console",
@@ -2672,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_cache"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "anyhow",
  "dashmap",
@@ -2698,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_conda_types"
-version = "0.27.6"
+version = "0.28.0"
 dependencies = [
  "chrono",
  "dirs",
@@ -2747,7 +2747,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_index"
-version = "0.19.28"
+version = "0.19.30"
 dependencies = [
  "fs-err",
  "rattler_conda_types",
@@ -2760,7 +2760,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_lock"
-version = "0.22.24"
+version = "0.22.25"
 dependencies = [
  "chrono",
  "file_url",
@@ -2815,7 +2815,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_package_streaming"
-version = "0.22.7"
+version = "0.22.8"
 dependencies = [
  "bzip2",
  "chrono",
@@ -2850,7 +2850,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.21.13"
+version = "0.21.15"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2863,6 +2863,7 @@ dependencies = [
  "dashmap",
  "dirs",
  "file_url",
+ "fs-err",
  "futures",
  "hex",
  "http 1.1.0",
@@ -2902,7 +2903,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_shell"
-version = "0.22.1"
+version = "0.22.2"
 dependencies = [
  "enum_dispatch",
  "indexmap 2.5.0",
@@ -2917,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "1.0.7"
+version = "1.0.9"
 dependencies = [
  "chrono",
  "futures",
@@ -2933,7 +2934,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_virtual_packages"
-version = "1.1.4"
+version = "1.1.5"
 dependencies = [
  "archspec",
  "libloading",
@@ -3137,15 +3138,16 @@ dependencies = [
 
 [[package]]
 name = "resolvo"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a472ebbac5a18c9e235e874df3aa0c8fb0b55611155dd5e5515a55a16520d76"
+checksum = "d68c0ae687bbcd99ab33236c7cbccd2ba1c526a7f7a59743cb991074414c5293"
 dependencies = [
  "ahash",
  "bitvec",
  "elsa",
  "event-listener",
  "futures",
+ "indexmap 2.5.0",
  "itertools 0.13.0",
  "petgraph",
  "tracing",

{py_rattler-0.7.0 → py_rattler-0.7.1}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "py-rattler"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "BSD-3-Clause"
 publish = false

{py_rattler-0.7.0 → py_rattler-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-rattler
-Version: 0.7.0
+Version: 0.7.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: BSD License

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.27.13](https://github.com/conda/rattler/compare/rattler-v0.27.12...rattler-v0.27.13) - 2024-10-01
+
+### Other
+
+- update Cargo.toml dependencies
+
+## [0.27.12](https://github.com/conda/rattler/compare/rattler-v0.27.11...rattler-v0.27.12) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.27.11](https://github.com/conda/rattler/compare/rattler-v0.27.10...rattler-v0.27.11) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler"
-version = "0.27.11"
+version = "0.27.13"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Rust library to install conda environments"
@@ -19,18 +19,18 @@ cli-tools = ['dep:clap']
 indicatif = ['dep:indicatif', 'dep:console']
 
 [dependencies]
-rattler_cache = { path = "../rattler_cache", version = "0.2.3", default-features = false }
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_cache = { path = "../rattler_cache", version = "0.2.4", default-features = false }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.0", default-features = false }
 rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false }
 rattler_networking = { path = "../rattler_networking", version = "0.21.4", default-features = false }
-rattler_shell = { path = "../rattler_shell", version = "0.22.1", default-features = false }
-rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.7", default-features = false, features = ["reqwest"] }
+rattler_shell = { path = "../rattler_shell", version = "0.22.2", default-features = false }
+rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.8", default-features = false, features = ["reqwest"] }
 simple_spawn_blocking = { path = "../simple_spawn_blocking", version = "1.0", default-features = false, features = ["tokio"] }
 anyhow = "1.0.82"
 clap = { version = "4.5.4", features = ["derive"] , optional = true }
 digest = "0.10.7"
 dirs = "5.0.1"
-fs-err = "2.11.0"
+fs-err = {  version = "2.11.0", features = ["tokio"] }
 futures = "0.3.30"
 humantime = "2.1.0"
 indexmap = "2.2.6"

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_cache/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.4](https://github.com/conda/rattler/compare/rattler_cache-v0.2.3...rattler_cache-v0.2.4) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.2.3](https://github.com/conda/rattler/compare/rattler_cache-v0.2.2...rattler_cache-v0.2.3) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_cache/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_cache"
-version = "0.2.3"
+version = "0.2.4"
 description = "A crate to manage the caching of data in rattler"
 categories= ["development-tools"]
 homepage= "https://github.com/conda/rattler"
@@ -11,10 +11,10 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { version = "0.27.6", path = "../rattler_conda_types", default-features = false }
+rattler_conda_types = { version = "0.28.0", path = "../rattler_conda_types", default-features = false }
 rattler_digest = { version = "1.0.2", path = "../rattler_digest", default-features = false }
 rattler_networking = { version = "0.21.4", path = "../rattler_networking", default-features = false }
-rattler_package_streaming = { version = "0.22.7", path = "../rattler_package_streaming", default-features = false, features = ["reqwest"] }
+rattler_package_streaming = { version = "0.22.8", path = "../rattler_package_streaming", default-features = false, features = ["reqwest"] }
 simple_spawn_blocking = { version = "1.0.0", path = "../simple_spawn_blocking", features = ["tokio"] }
 anyhow = "1.0.82"
 dashmap = "6.0.1"

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_conda_types/CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.28.0](https://github.com/conda/rattler/compare/rattler_conda_types-v0.27.6...rattler_conda_types-v0.28.0) - 2024-09-23
+
+### Added
+
+- add path to namedchannelorurl ([#873](https://github.com/conda/rattler/pull/873))
+- add serialization for `GenericVirtualPackage` ([#865](https://github.com/conda/rattler/pull/865))
+
+### Fixed
+
+- improve when we print brackets ([#861](https://github.com/conda/rattler/pull/861))
+
 ## [0.27.6](https://github.com/conda/rattler/compare/rattler_conda_types-v0.27.5...rattler_conda_types-v0.27.6) - 2024-09-09
 
 ### Fixed

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_conda_types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_conda_types"
-version = "0.27.6"
+version = "0.28.0"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Rust data types for common types used within the Conda ecosystem"

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_index/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.19.30](https://github.com/conda/rattler/compare/rattler_index-v0.19.29...rattler_index-v0.19.30) - 2024-10-01
+
+### Other
+
+- update Cargo.toml dependencies
+
+## [0.19.29](https://github.com/conda/rattler/compare/rattler_index-v0.19.28...rattler_index-v0.19.29) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.19.28](https://github.com/conda/rattler/compare/rattler_index-v0.19.27...rattler_index-v0.19.28) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_index/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_index"
-version = "0.19.28"
+version = "0.19.30"
 edition= "2021"
 authors = []
 description = "A crate that indexes directories containing conda packages to create local conda channels"
@@ -12,10 +12,10 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { path= "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_conda_types = { path= "../rattler_conda_types", version = "0.28.0", default-features = false }
 rattler_digest = { path= "../rattler_digest", version = "1.0.2", default-features = false }
-rattler_package_streaming = { path= "../rattler_package_streaming", version = "0.22.7", default-features = false }
-fs-err = "2.11.0"
+rattler_package_streaming = { path= "../rattler_package_streaming", version = "0.22.8", default-features = false }
+fs-err = {  version = "2.11.0", features = ["tokio"] }
 serde_json = { version = "1.0.116" }
 tracing = "0.1.40"
 walkdir = "2.5.0"

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_lock/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.25](https://github.com/conda/rattler/compare/rattler_lock-v0.22.24...rattler_lock-v0.22.25) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.22.24](https://github.com/conda/rattler/compare/rattler_lock-v0.22.23...rattler_lock-v0.22.24) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_lock/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_lock"
-version = "0.22.24"
+version = "0.22.25"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Rust data types for conda lock"
@@ -12,7 +12,7 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.0", default-features = false }
 rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false }
 file_url = { path = "../file_url", version = "0.1.5" }
 chrono = { version = "0.4.38", default-features = false, features = [

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_package_streaming/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.8](https://github.com/conda/rattler/compare/rattler_package_streaming-v0.22.7...rattler_package_streaming-v0.22.8) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.22.7](https://github.com/conda/rattler/compare/rattler_package_streaming-v0.22.6...rattler_package_streaming-v0.22.7) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_package_streaming/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_package_streaming"
-version = "0.22.7"
+version = "0.22.8"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "Extract and stream of Conda package archives"
@@ -12,7 +12,7 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.0", default-features = false }
 rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false }
 rattler_networking = { path = "../rattler_networking", version = "0.21.4", default-features = false }
 rattler_redaction = { version = "0.1.2", path = "../rattler_redaction", features = ["reqwest", "reqwest-middleware"] }

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.15](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.21.14...rattler_repodata_gateway-v0.21.15) - 2024-10-01
+
+### Other
+
+- start using fs-err in repodata_gateway ([#877](https://github.com/conda/rattler/pull/877))
+
+## [0.21.14](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.21.13...rattler_repodata_gateway-v0.21.14) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.21.13](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.21.12...rattler_repodata_gateway-v0.21.13) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_repodata_gateway"
-version = "0.21.13"
+version = "0.21.15"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "A crate to interact with Conda repodata"
@@ -13,12 +13,13 @@ resolver = "2"
 
 [dependencies]
 file_url = { path = "../file_url", version = "0.1.5" }
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.27.6", default-features = false, optional = true }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.0", default-features = false, optional = true }
 rattler_digest = { path = "../rattler_digest", version = "1.0.2", default-features = false, features = ["tokio", "serde"] }
 rattler_networking = { path = "../rattler_networking", version = "0.21.4", default-features = false }
 simple_spawn_blocking = { path = "../simple_spawn_blocking", version = "1.0", features = ["tokio"] }
-rattler_cache = { version = "0.2.3", path = "../rattler_cache" }
+rattler_cache = { version = "0.2.4", path = "../rattler_cache" }
 rattler_redaction = { version = "0.1.2", path = "../rattler_redaction", features = ["reqwest", "reqwest-middleware"] }
+fs-err = {  version = "2.11.0", features = ["tokio"] }
 anyhow = "1.0.82"
 async-fd-lock = "0.2.0"
 async-compression = { version = "0.4.8", features = [

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/src/fetch/cache/mod.rs

@@ -1,10 +1,11 @@
 mod cache_headers;
 
 pub use cache_headers::CacheHeaders;
+use fs_err as fs;
 use rattler_digest::{serde::SerializableHash, Blake2b256};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde_with::serde_as;
-use std::{fs, fs::File, path::Path, str::FromStr, time::SystemTime};
+use std::{path::Path, str::FromStr, time::SystemTime};
 use url::Url;
 
 /// Representation of the `.info.json` file alongside a `repodata.json` file.
@@ -72,7 +73,7 @@ impl RepoDataState {
 
     /// Save the cache state to the specified file.
     pub fn to_path(&self, path: &Path) -> Result<(), std::io::Error> {
-        let file = File::create(path)?;
+        let file = fs::File::create(path)?;
         Ok(serde_json::to_writer_pretty(file, self)?)
     }
 }

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/src/fetch/jlap/mod.rs

@@ -81,6 +81,7 @@
 
 use blake2::digest::Output;
 use blake2::digest::{FixedOutput, Update};
+use fs_err as fs;
 use rattler_digest::{
     parse_digest_from_hex, serde::SerializableHash, Blake2b256, Blake2b256Hash, Blake2bMac256,
 };
@@ -537,8 +538,7 @@ fn apply_jlap_patches(
     }
 
     // Read the contents of the current repodata to a string
-    let repo_data_contents =
-        std::fs::read_to_string(repo_data_path).map_err(JLAPError::FileSystem)?;
+    let repo_data_contents = fs::read_to_string(repo_data_path).map_err(JLAPError::FileSystem)?;
 
     // Parse the JSON so we can manipulate it
     tracing::info!("parsing cached repodata.json as JSON");
@@ -637,6 +637,8 @@ mod test {
     use tempfile::TempDir;
     use url::Url;
 
+    use fs_err::tokio as tokio_fs;
+
     const FAKE_STATE_DATA_INITIAL: &str = r#"{
   "url": "https://repo.example.com/pkgs/main/osx-64/repodata.json.zst",
   "etag": "W/\"49aa6d9ea6f3285efe657780a7c8cd58\"",
@@ -851,14 +853,14 @@ mod test {
 
         if let Some(content) = server_jlap {
             // Add files we need to request to the server
-            tokio::fs::write(subdir_path.path().join("repodata.jlap"), content)
+            tokio_fs::write(subdir_path.path().join("repodata.jlap"), content)
                 .await
                 .unwrap();
         }
 
         if let Some(content) = server_repo_data {
             // Add files we need to request to the server
-            tokio::fs::write(subdir_path.path().join("repodata.json"), content)
+            tokio_fs::write(subdir_path.path().join("repodata.json"), content)
                 .await
                 .unwrap();
         }

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/src/fetch/mod.rs

@@ -24,6 +24,9 @@ use tokio_util::io::StreamReader;
 use tracing::instrument;
 use url::Url;
 
+// use fs-err for better error reporting
+use fs_err::tokio as tokio_fs;
+
 mod cache;
 pub mod jlap;
 
@@ -231,7 +234,7 @@ async fn repodata_from_file(
     lock_file: LockedFile,
 ) -> Result<CachedRepoData, FetchRepoDataError> {
     // copy file from subdir_url to out_path
-    if let Err(e) = tokio::fs::copy(&subdir_url.to_file_path().unwrap(), &out_path).await {
+    if let Err(e) = tokio_fs::copy(&subdir_url.to_file_path().unwrap(), &out_path).await {
         return if e.kind() == ErrorKind::NotFound {
             Err(FetchRepoDataError::NotFound(
                 RepoDataNotFoundError::FileSystemError(e),
@@ -244,7 +247,7 @@ async fn repodata_from_file(
     // create a dummy cache state
     let new_cache_state = RepoDataState {
         url: subdir_url.clone(),
-        cache_size: tokio::fs::metadata(&out_path)
+        cache_size: tokio_fs::metadata(&out_path)
             .await
             .map_err(FetchRepoDataError::IoError)?
             .len(),
@@ -652,7 +655,10 @@ async fn stream_and_decode_to_file(
 
     // Clone the file handle and create a hashing writer so we can compute a hash while the content
     // is being written to disk.
-    let file = tokio::fs::File::from_std(temp_file.as_file().try_clone().unwrap());
+    let file = tokio_fs::File::from_std(fs_err::File::from_parts(
+        temp_file.as_file().try_clone().unwrap(),
+        temp_file.path(),
+    ));
     let mut hashing_file_writer = HashingWriter::<_, Blake2b256>::new(file);
 
     // Decode, hash and write the data to the file.

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_repodata_gateway/src/sparse/mod.rs

@@ -11,6 +11,7 @@ use std::{
 };
 
 use bytes::Bytes;
+use fs_err as fs;
 use futures::{stream, StreamExt, TryFutureExt, TryStreamExt};
 use itertools::Itertools;
 use rattler_conda_types::{
@@ -102,7 +103,7 @@ impl SparseRepoData {
         path: impl AsRef<Path>,
         patch_function: Option<fn(&mut PackageRecord)>,
     ) -> Result<Self, io::Error> {
-        let file = std::fs::File::open(path)?;
+        let file = fs::File::open(path.as_ref().to_owned())?;
         let memory_map = unsafe { memmap2::Mmap::map(&file) }?;
         Ok(SparseRepoData {
             inner: SparseRepoDataInner::Memmapped(
@@ -482,6 +483,7 @@ mod test {
 
     use super::{load_repo_data_recursively, PackageFilename, SparseRepoData};
     use crate::utils::test::fetch_repo_data;
+    use fs_err as fs;
 
     fn test_dir() -> PathBuf {
         Path::new(env!("CARGO_MANIFEST_DIR")).join("../../test-data")
@@ -510,7 +512,7 @@ mod test {
             .await
             .into_iter()
             .map(|(channel, subdir, path)| {
-                let bytes = std::fs::read(path).unwrap();
+                let bytes = fs::read(path).unwrap();
                 (channel, subdir, bytes.into())
             })
             .collect()
@@ -658,7 +660,7 @@ mod test {
             test_dir().join("channels/conda-forge/noarch/repodata.json"),
             test_dir().join("channels/conda-forge/linux-64/repodata.json"),
         ] {
-            let str = std::fs::read_to_string(&path).unwrap();
+            let str = fs::read_to_string(&path).unwrap();
             let repo_data: RepoData = serde_json::from_str(&str).unwrap();
             records.push(repo_data);
         }

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_shell/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.22.2](https://github.com/conda/rattler/compare/rattler_shell-v0.22.1...rattler_shell-v0.22.2) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [0.22.1](https://github.com/conda/rattler/compare/rattler_shell-v0.22.0...rattler_shell-v0.22.1) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_shell/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_shell"
-version = "0.22.1"
+version = "0.22.2"
 edition= "2021"
 authors = ["Wolf Vollprecht <w.vollprecht@gmail.com>"]
 description = "A crate to help with activation and deactivation of a conda environment"
@@ -12,7 +12,7 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { path= "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_conda_types = { path= "../rattler_conda_types", version = "0.28.0", default-features = false }
 enum_dispatch = "0.3.13"
 indexmap = "2.2.6"
 itertools = "0.13.0"

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_solve/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.9](https://github.com/conda/rattler/compare/rattler_solve-v1.0.8...rattler_solve-v1.0.9) - 2024-10-01
+
+### Other
+
+- update resolvo ([#881](https://github.com/conda/rattler/pull/881))
+
+## [1.0.8](https://github.com/conda/rattler/compare/rattler_solve-v1.0.7...rattler_solve-v1.0.8) - 2024-09-23
+
+### Other
+
+- updated the following local packages: rattler_conda_types
+
 ## [1.0.7](https://github.com/conda/rattler/compare/rattler_solve-v1.0.6...rattler_solve-v1.0.7) - 2024-09-09
 
 ### Other

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_solve/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_solve"
-version = "1.0.7"
+version = "1.0.9"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "A crate to solve conda environments"
@@ -12,7 +12,7 @@ readme= "README.md"
 resolver = "2"
 
 [dependencies]
-rattler_conda_types = { path= "../rattler_conda_types", version = "0.27.6", default-features = false }
+rattler_conda_types = { path= "../rattler_conda_types", version = "0.28.0", default-features = false }
 rattler_digest = { path= "../rattler_digest", version = "1.0.2", default-features = false }
 rattler_libsolv_c = { path= "../rattler_libsolv_c", version = "1.0.2", default-features = false, optional = true }
 libc = { version = "0.2" , optional = true }
@@ -26,7 +26,7 @@ tracing = "0.1.40"
 itertools = "0.13.0"
 url = { version = "2.5.0" }
 tempfile = "3.10.1"
-resolvo = { version = "0.8.0" , optional = true }
+resolvo = { version = "0.8.1" , optional = true }
 futures = { version = "0.3.30", optional = true }
 serde = { version = "1.0.198" , optional = true }
 

{py_rattler-0.7.0 → py_rattler-0.7.1}/local_dependencies/rattler_solve/tests/snapshots/backends__resolvo__solve_with_error.snap

@@ -4,9 +4,8 @@ expression: err
 ---
 Cannot solve the request because of: The following packages are incompatible
 ├─ bors >=2 can be installed with any of the following options:
-│  └─ bors 2.0
+│  └─ bors 2.0 | 2.1
 └─ foobar >=2 cannot be installed because there are no viable options:
    └─ foobar 2.0 | 2.1 would require
       └─ bors <2.0, which cannot be installed because there are no viable options:
-         ├─ bors 1.2.1, which conflicts with the versions reported above.
-         └─ bors 1.0 | 1.1, which conflicts with the versions reported above.
+         └─ bors 1.0 | 1.1 | 1.2.1, which conflicts with the versions reported above.