Merge remote-tracking branch 'upstream/main' into perf/prefix-always-…

…sharded

.github/workflows/python-bindings.yml

@@ -46,4 +46,4 @@ jobs:
       - name: Run tests
         run: |
           cd py-rattler
-          pixi run -e test test
+          pixi run -e test test --color=yes

Cargo.toml

@@ -23,26 +23,26 @@ tag-prefix = ""
 lto = true
 
 [workspace.dependencies]
-anyhow = "1.0.82"
+anyhow = "1.0.92"
 archspec = "0.1.3"
 assert_matches = "1.5.0"
-async-compression = { version = "0.4.8", features = [
+async-compression = { version = "0.4.17", features = [
     "gzip",
     "tokio",
     "bzip2",
     "zstd",
 ] }
 async-fd-lock = "0.2.0"
-fs4 = "0.9.1"
-async-trait = "0.1.80"
-axum = { version = "0.7.5", default-features = false, features = [
+fs4 = "0.11.0"
+async-trait = "0.1.83"
+axum = { version = "0.7.7", default-features = false, features = [
     "tokio",
     "http1",
 ] }
-base64 = "0.22.0"
-bindgen = "0.69.4"
+base64 = "0.22.1"
+bindgen = "0.69.5"
 blake2 = "0.10.6"
-bytes = "1.6.0"
+bytes = "1.8.0"
 bzip2 = "0.4.4"
 cache_control = "0.2.0"
 cfg-if = "1.0"
@@ -51,80 +51,82 @@ chrono = { version = "0.4.38", default-features = false, features = [
     "serde",
     "alloc",
 ] }
-clap = { version = "4.5.4", features = ["derive"] }
-cmake = "0.1.50"
+clap = { version = "4.5.20", features = ["derive"] }
+cmake = "0.1.51"
 console = { version = "0.15.8", features = ["windows-console-colors"] }
 criterion = "0.5"
-dashmap = "6.0.1"
+dashmap = "6.1.0"
 difference = "2.0.0"
 digest = "0.10.7"
 dirs = "5.0.1"
-dunce = "1.0.4"
+dunce = "1.0.5"
 enum_dispatch = "0.3.13"
-fs-err = { version = "2.11.0", features = ["tokio"] }
+fs-err = { version = "3.0.0", features = ["tokio"] }
 fslock = "0.2.1"
-futures = "0.3.30"
-futures-util = "0.3.30"
+futures = "0.3.31"
+futures-util = "0.3.31"
 fxhash = "0.2.1"
-generic-array = "0.14.4"
-getrandom = { version = "0.2.14", default-features = false }
+# lots of other crates are still stuck on older version
+generic-array = "0.14.7"
+getrandom = { version = "0.2.15", default-features = false }
 glob = "0.3.1"
-google-cloud-auth = { version = "0.13.2", default-features = false }
+google-cloud-auth = { version = "0.17.1", default-features = false }
+google-cloud-token = "0.1.2"
 hex = "0.4.3"
 hex-literal = "0.4.1"
 http = "1.1"
 http-cache-semantics = "2.1.0"
 humansize = "2.1.3"
 humantime = "2.1.0"
-indexmap = "2.2.6"
+indexmap = "2.6.0"
 indicatif = "0.17.8"
-insta = { version = "1.38.0" }
+insta = { version = "1.41.1" }
 itertools = "0.13.0"
-json-patch = "2.0.0"
-keyring = "3.1.0"
-lazy-regex = "3.1.0"
-lazy_static = "1.4.0"
+json-patch = "3.0.1"
+keyring = "3.6.1"
+lazy-regex = "3.3.0"
+lazy_static = "1.5.0"
 libc = { version = "0.2" }
-libloading = "0.8.3"
-libz-sys = { version = "1.1.16", default-features = false }
+libloading = "0.8.5"
+libz-sys = { version = "1.1.20", default-features = false }
 md-5 = "0.10.6"
-memchr = "2.7.2"
-memmap2 = "0.9.4"
+memchr = "2.7.4"
+memmap2 = "0.9.5"
 netrc-rs = "0.1.2"
 nom = "7.1.3"
 num_cpus = "1.16.0"
-once_cell = "1.19.0"
-ouroboros = "0.18.3"
-parking_lot = "0.12.1"
-pathdiff = "0.2.1"
-pep440_rs = { version = "0.6.0" }
-pep508_rs = { version = "0.6.0" }
+once_cell = "1.20.2"
+ouroboros = "0.18.4"
+parking_lot = "0.12.3"
+pathdiff = "0.2.2"
+pep440_rs = { version = "0.7.2" }
+pep508_rs = { version = "0.9.1" }
 percent-encoding = "2.3.1"
-pin-project-lite = "0.2.14"
+pin-project-lite = "0.2.15"
 plist = "1"
-purl = { version = "0.1.2", features = ["serde"] }
-quote = "1.0.36"
+purl = { version = "0.1.3", features = ["serde"] }
+quote = "1.0.37"
 rand = "0.8.5"
-reflink-copy = "0.1.16"
-regex = "1.10.4"
-reqwest = { version = "0.12.3", default-features = false }
-reqwest-middleware = "0.3.0"
-reqwest-retry = "0.6.0"
-resolvo = { version = "0.8.2" }
+reflink-copy = "0.1.19"
+regex = "1.11.1"
+reqwest = { version = "0.12.9", default-features = false }
+reqwest-middleware = "0.3.3"
+reqwest-retry = "0.6.1"
+resolvo = { version = "0.8.4" }
 retry-policies = { version = "0.4.0", default-features = false }
-rmp-serde = { version = "1.2.0" }
-rstest = { version = "0.21.0" }
+rmp-serde = { version = "1.3.0" }
+rstest = { version = "0.23.0" }
 rstest_reuse = "0.7.0"
-simd-json = { version = "0.14.0", features = ["serde_impl"] }
-serde = { version = "1.0.198" }
-serde_json = { version = "1.0.116" }
+simd-json = { version = "0.14.2", features = ["serde_impl"] }
+serde = { version = "1.0.214" }
+serde_json = { version = "1.0.132" }
 serde_repr = "0.1"
-serde_with = "3.7.0"
+serde_with = "3.11.0"
 serde_yaml = "0.9.34"
 serde-untagged = "0.1.6"
 sha2 = "0.10.8"
 shlex = "1.3.0"
-similar-asserts = "1.5.0"
+similar-asserts = "1.6.0"
 smallvec = { version = "1.13.2", features = [
     "serde",
     "const_new",
@@ -133,27 +135,27 @@ smallvec = { version = "1.13.2", features = [
 ] }
 strum = { version = "0.26.3", features = ["derive"] }
 superslice = "1.0.0"
-syn = "2.0.59"
-sysinfo = "0.30.10"
-tar = "0.4.40"
+syn = "2.0.86"
+sysinfo = "0.32.0"
+tar = "0.4.42"
 tempdir = "0.3.7"
-tempfile = "3.10.1"
+tempfile = "3.13.0"
 temp-env = "0.3.6"
-test-log = "0.2.15"
+test-log = "0.2.16"
 thiserror = "1.0"
-tokio = { version = "1.37.0", default-features = false }
-tokio-stream = "0.1.15"
-tokio-util = "0.7.10"
-tower = { version = "0.4.13", default-features = false }
-tower-http = { version = "0.5.2", default-features = false }
+tokio = { version = "1.41.0", default-features = false }
+tokio-stream = "0.1.16"
+tokio-util = "0.7.12"
+tower = { version = "0.5.1", default-features = false }
+tower-http = { version = "0.6.1", default-features = false }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", default-features = false }
-tracing-test = { version = "0.2.4" }
-trybuild = { version = "1.0.91" }
-typed-path = { version = "0.9.2" }
-url = { version = "2.5.0" }
-uuid = { version = "1.8.0", default-features = false }
+tracing-test = { version = "0.2.5" }
+trybuild = { version = "1.0.101" }
+typed-path = { version = "0.9.3" }
+url = { version = "2.5.2" }
+uuid = { version = "1.11.0", default-features = false }
 walkdir = "2.5.0"
-windows-sys = { version = "0.52.0", default-features = false }
-zip = { version = "2.1.3", default-features = false }
-zstd = { version = "0.13.1", default-features = false }
+windows-sys = { version = "0.59.0", default-features = false }
+zip = { version = "2.2.0", default-features = false }
+zstd = { version = "0.13.2", default-features = false }

crates/file_url/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.7](https://github.com/conda/rattler/compare/file_url-v0.1.6...file_url-v0.1.7) - 2024-11-04
+
+### Other
+
+- update all versions of packages ([#886](https://github.com/conda/rattler/pull/886))
+
 ## [0.1.6](https://github.com/conda/rattler/compare/file_url-v0.1.5...file_url-v0.1.6) - 2024-10-21
 
 ### Other

crates/file_url/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "file_url"
-version = "0.1.6"
+version = "0.1.7"
 edition.workspace = true
 authors = ["Bas Zalmstra <[email protected]>"]
 description = "Helper functions to work with file:// urls"
@@ -13,7 +13,7 @@ url = { workspace = true }
 percent-encoding = { workspace = true }
 itertools = { workspace = true }
 typed-path = { workspace = true }
-thiserror = "1.0.61"
+thiserror = "1.0.66"
 
 [dev-dependencies]
 rstest = { workspace = true }

crates/rattler-bin/Cargo.toml

@@ -27,13 +27,13 @@ clap = { workspace = true, features = ["derive"] }
 console = { workspace = true, features = ["windows-console-colors"] }
 indicatif = { workspace = true }
 once_cell = { workspace = true }
-rattler = { path="../rattler", version = "0.27.16", default-features = false, features = ["indicatif"] }
-rattler_conda_types = { path="../rattler_conda_types", version = "0.28.3", default-features = false }
-rattler_networking = { path="../rattler_networking", version = "0.21.4", default-features = false, features = ["google-cloud-auth"] }
-rattler_repodata_gateway = { path="../rattler_repodata_gateway", version = "0.21.18", default-features = false, features = ["gateway"] }
-rattler_solve = { path="../rattler_solve", version = "1.1.0", default-features = false, features = ["resolvo", "libsolv_c"] }
-rattler_virtual_packages = { path="../rattler_virtual_packages", version = "1.1.7", default-features = false }
-rattler_cache = { path="../rattler_cache", version = "0.2.7", default-features = false }
+rattler = { path="../rattler", version = "0.28.0", default-features = false, features = ["indicatif"] }
+rattler_conda_types = { path="../rattler_conda_types", version = "0.29.0", default-features = false }
+rattler_networking = { path="../rattler_networking", version = "0.21.5", default-features = false, features = ["gcs"] }
+rattler_repodata_gateway = { path="../rattler_repodata_gateway", version = "0.21.20", default-features = false, features = ["gateway"] }
+rattler_solve = { path="../rattler_solve", version = "1.2.1", default-features = false, features = ["resolvo", "libsolv_c"] }
+rattler_virtual_packages = { path="../rattler_virtual_packages", version = "1.1.8", default-features = false }
+rattler_cache = { path="../rattler_cache", version = "0.2.8", default-features = false }
 reqwest = { workspace = true }
 reqwest-middleware = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "macros"] }

crates/rattler/CHANGELOG.md

@@ -6,6 +6,16 @@ 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-v0.27.16...rattler-v0.28.0) - 2024-11-04
+
+### Added
+
+- use python_site_packages_path field when available for installing noarch: python packages, CEP-17 ([#909](https://github.com/conda/rattler/pull/909))
+
+### Fixed
+
+- typo in `set_io_concurrentcy_limit` ([#914](https://github.com/conda/rattler/pull/914))
+
 ## [0.27.16](https://github.com/conda/rattler/compare/rattler-v0.27.15...rattler-v0.27.16) - 2024-10-21
 
 ### Fixed

crates/rattler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler"
-version = "0.27.16"
+version = "0.28.0"
 edition.workspace = true
 authors = ["Bas Zalmstra <[email protected]>"]
 description = "Rust library to install conda environments"
@@ -32,12 +32,12 @@ memchr = { workspace = true }
 memmap2 = { workspace = true }
 once_cell = { workspace = true }
 parking_lot = { workspace = true }
-rattler_cache = { path = "../rattler_cache", version = "0.2.7", default-features = false }
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.3", 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.4", default-features = false }
-rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.10", default-features = false, features = ["reqwest"] }
+rattler_cache = { path = "../rattler_cache", version = "0.2.8", default-features = false }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.29.0", default-features = false }
+rattler_digest = { path = "../rattler_digest", version = "1.0.3", default-features = false }
+rattler_networking = { path = "../rattler_networking", version = "0.21.5", default-features = false }
+rattler_shell = { path = "../rattler_shell", version = "0.22.5", default-features = false }
+rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.11", default-features = false, features = ["reqwest"] }
 reflink-copy = { workspace = true }
 regex = { workspace = true }
 reqwest = { workspace = true, features = ["stream", "json", "gzip"] }

crates/rattler/src/install/clobber_registry.rs

@@ -1154,9 +1154,12 @@ mod tests {
         // Create a transaction
         let operations = test_python_noarch_operations();
 
-        let python_info =
-            PythonInfo::from_version(&Version::from_str("3.11.0").unwrap(), Platform::current())
-                .unwrap();
+        let python_info = PythonInfo::from_version(
+            &Version::from_str("3.11.0").unwrap(),
+            None,
+            Platform::current(),
+        )
+        .unwrap();
         let transaction = transaction::Transaction::<PrefixRecord, RepoDataRecord> {
             operations,
             python_info: Some(python_info.clone()),

crates/rattler/src/install/entry_point.rs

@@ -205,17 +205,25 @@ mod test {
             "/prefix",
             false,
             &EntryPoint::from_str("jupyter-lab = jupyterlab.labapp:main").unwrap(),
-            &PythonInfo::from_version(&Version::from_str("3.11.0").unwrap(), Platform::Linux64)
-                .unwrap(),
+            &PythonInfo::from_version(
+                &Version::from_str("3.11.0").unwrap(),
+                None,
+                Platform::Linux64,
+            )
+            .unwrap(),
         );
         insta::assert_snapshot!(script);
 
         let script = super::python_entry_point_template(
             "/prefix",
             true,
             &EntryPoint::from_str("jupyter-lab = jupyterlab.labapp:main").unwrap(),
-            &PythonInfo::from_version(&Version::from_str("3.11.0").unwrap(), Platform::Linux64)
-                .unwrap(),
+            &PythonInfo::from_version(
+                &Version::from_str("3.11.0").unwrap(),
+                None,
+                Platform::Linux64,
+            )
+            .unwrap(),
         );
         insta::assert_snapshot!("windows", script);
     }

crates/rattler/src/install/installer/mod.rs

@@ -93,7 +93,7 @@ impl Installer {
     ///
     /// This function is similar to [`Self::with_io_concurrency_limit`],
     /// but modifies an existing instance.
-    pub fn set_io_concurrentcy_limit(&mut self, limit: usize) -> &mut Self {
+    pub fn set_io_concurrency_limit(&mut self, limit: usize) -> &mut Self {
         self.io_semaphore = Some(Arc::new(Semaphore::new(limit)));
         self
     }

crates/rattler/src/install/mod.rs

@@ -784,7 +784,8 @@ mod test {
 
         // Specify python version
         let python_version =
-            PythonInfo::from_version(&Version::from_str("3.11.0").unwrap(), platform).unwrap();
+            PythonInfo::from_version(&Version::from_str("3.11.0").unwrap(), None, platform)
+                .unwrap();
 
         // Download and install each layer into an environment.
         let install_driver = InstallDriver::default();