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

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

@@ -2414,7 +2414,7 @@ dependencies = [
 
 [[package]]
 name = "py-rattler"
-version = "0.7.1"
+version = "0.7.2"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2634,7 +2634,7 @@ dependencies = [
 
 [[package]]
 name = "rattler"
-version = "0.27.13"
+version = "0.27.15"
 dependencies = [
  "anyhow",
  "console",
@@ -2672,7 +2672,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_cache"
-version = "0.2.4"
+version = "0.2.6"
 dependencies = [
  "anyhow",
  "dashmap",
@@ -2698,7 +2698,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_conda_types"
-version = "0.28.0"
+version = "0.28.2"
 dependencies = [
  "chrono",
  "dirs",
@@ -2747,7 +2747,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_index"
-version = "0.19.30"
+version = "0.19.32"
 dependencies = [
  "fs-err",
  "rattler_conda_types",
@@ -2760,7 +2760,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_lock"
-version = "0.22.25"
+version = "0.22.27"
 dependencies = [
  "chrono",
  "file_url",
@@ -2815,7 +2815,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_package_streaming"
-version = "0.22.8"
+version = "0.22.10"
 dependencies = [
  "bzip2",
  "chrono",
@@ -2850,7 +2850,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.21.15"
+version = "0.21.17"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2903,7 +2903,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_shell"
-version = "0.22.2"
+version = "0.22.4"
 dependencies = [
  "enum_dispatch",
  "indexmap 2.5.0",
@@ -2918,7 +2918,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "1.0.9"
+version = "1.1.0"
 dependencies = [
  "chrono",
  "futures",
@@ -2934,7 +2934,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_virtual_packages"
-version = "1.1.5"
+version = "1.1.7"
 dependencies = [
  "archspec",
  "libloading",
@@ -3138,9 +3138,9 @@ dependencies = [
 
 [[package]]
 name = "resolvo"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d68c0ae687bbcd99ab33236c7cbccd2ba1c526a7f7a59743cb991074414c5293"
+checksum = "1621ce52e3ff36c8f55f0017f1e4909f59514af8f852ee943997760bf12c7c15"
 dependencies = [
  "ahash",
  "bitvec",

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

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

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

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

{py_rattler-0.7.1 → py_rattler-0.7.2}/local_dependencies/file_url/Cargo.toml

@@ -14,4 +14,4 @@ thiserror = "1.0.61"
 url = { version = "2.5.0" }
 percent-encoding = "2.3.1"
 itertools = "0.13.0"
-typed-path = { version = "0.9.0" }
+typed-path = { version = "0.9.2" }

{py_rattler-0.7.1 → py_rattler-0.7.2}/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.15](https://github.com/conda/rattler/compare/rattler-v0.27.14...rattler-v0.27.15) - 2024-10-07
+
+### Fixed
+
+- self-clobber when updating/downgrading packages ([#893](https://github.com/conda/rattler/pull/893))
+
+## [0.27.14](https://github.com/conda/rattler/compare/rattler-v0.27.13...rattler-v0.27.14) - 2024-10-03
+
+### Fixed
+
+- fix-up shebangs with spaces ([#887](https://github.com/conda/rattler/pull/887))
+
 ## [0.27.13](https://github.com/conda/rattler/compare/rattler-v0.27.12...rattler-v0.27.13) - 2024-10-01
 
 ### Other

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

@@ -1,6 +1,6 @@
 [package]
 name = "rattler"
-version = "0.27.13"
+version = "0.27.15"
 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.4", default-features = false }
-rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.0", default-features = false }
+rattler_cache = { path = "../rattler_cache", version = "0.2.6", default-features = false }
+rattler_conda_types = { path = "../rattler_conda_types", version = "0.28.2", 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.2", default-features = false }
-rattler_package_streaming = { path = "../rattler_package_streaming", version = "0.22.8", default-features = false, features = ["reqwest"] }
+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"] }
 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 = {  version = "2.11.0", features = ["tokio"] }
+fs-err = { version = "2.11.0", features = ["tokio"] }
 futures = "0.3.30"
 humantime = "2.1.0"
 indexmap = "2.2.6"

{py_rattler-0.7.1 → py_rattler-0.7.2}/local_dependencies/rattler/src/install/clobber_registry.rs

@@ -103,12 +103,22 @@ impl ClobberRegistry {
     /// Register that all the paths of a package are being removed.
     pub fn unregister_paths(&mut self, prefix_paths: &PrefixRecord) {
         // Find the name in the registry
-        let name_idx = PackageNameIdx(
-            self.package_names
-                .iter()
-                .position(|n| n == &prefix_paths.repodata_record.package_record.name)
-                .expect("Package name not found in registry"),
-        );
+        let Some(name_idx) = self
+            .package_names
+            .iter()
+            .position(|n| n == &prefix_paths.repodata_record.package_record.name)
+            .map(PackageNameIdx)
+        else {
+            tracing::warn!(
+                "Tried to unregister paths for a package ({}) that is not in the registry",
+                prefix_paths
+                    .repodata_record
+                    .package_record
+                    .name
+                    .as_normalized()
+            );
+            return;
+        };
 
         // Remove this package from any clobbering consideration.
         for p in &prefix_paths.paths_data.paths {
@@ -117,7 +127,11 @@ impl ClobberRegistry {
                 clobber.retain(|&idx| idx != name_idx);
             }
 
-            let paths_entry = self.paths_registry.get_mut(path).expect("entry must exist");
+            let Some(paths_entry) = self.paths_registry.get_mut(path) else {
+                tracing::warn!("The path {} is not in the registry", path.display());
+                continue;
+            };
+
             if *paths_entry == Some(name_idx) {
                 *paths_entry = None;
             }
@@ -147,16 +161,29 @@ impl ClobberRegistry {
         };
 
         for (_, path) in computed_paths {
-            // if we find an entry, we have a clobbering path!
-            if let Some(&primary_package_idx) = self.paths_registry.get(path) {
-                let new_path = clobber_name(path, &self.package_names[name_idx.0]);
-                self.clobbers
-                    .entry(path.clone())
-                    .or_insert_with(|| primary_package_idx.map(|v| vec![v]).unwrap_or_default())
-                    .push(name_idx);
-
-                // We insert the non-renamed path here
-                clobber_paths.insert(path.clone(), new_path);
+            if let Some(&entry) = self.paths_registry.get(path) {
+                if let Some(primary_package_idx) = entry {
+                    // if we find an entry, we have a clobbering path!
+                    // Then we rename the current path to a clobbered path
+                    let new_path = clobber_name(path, &self.package_names[name_idx.0]);
+                    self.clobbers
+                        .entry(path.clone())
+                        .or_insert_with(|| vec![primary_package_idx])
+                        .push(name_idx);
+
+                    // We insert the non-renamed path here
+                    clobber_paths.insert(path.clone(), new_path);
+                } else {
+                    // In this case, the path we are looking at was previously
+                    // removed so we need to add it back to the registry
+                    self.paths_registry.insert(path.clone(), Some(name_idx));
+
+                    // If we previously had clobbers with this path, we need to
+                    // add the re-installed package back to the clobbers
+                    if let Some(entry) = self.clobbers.get_mut(path) {
+                        entry.push(name_idx);
+                    }
+                }
             } else {
                 self.paths_registry.insert(path.clone(), Some(name_idx));
             }
@@ -185,6 +212,7 @@ impl ClobberRegistry {
         let mut prefix_records_to_rewrite = HashSet::new();
         let mut result = HashMap::new();
 
+        tracing::info!("Unclobbering {} files", self.clobbers.len());
         for (path, clobbered_by) in self.clobbers.iter() {
             let clobbered_by_names = clobbered_by
                 .iter()
@@ -199,11 +227,15 @@ impl ClobberRegistry {
                 .filter(|(_, n)| clobbered_by_names.contains(n))
                 .collect::<Vec<_>>();
 
-            let current_winner = self
-                .paths_registry
-                .get(path)
-                .expect("if a file is clobbered it must also be in the registry")
-                .map(|idx| &self.package_names[idx.0]);
+            let Some(current_winner_entry) = self.paths_registry.get(path) else {
+                tracing::warn!(
+                    "The path {} is clobbered but not in the registry",
+                    path.display()
+                );
+                continue;
+            };
+
+            let current_winner = current_winner_entry.map(|idx| &self.package_names[idx.0]);
 
             // Determine which package should write to the file
             let winner = match sorted_clobbered_by.last() {
@@ -264,25 +296,25 @@ impl ClobberRegistry {
                         },
                     )?;
 
-                    let loser_idx = sorted_clobbered_by
+                    if let Some(loser_idx) = sorted_clobbered_by
                         .iter()
                         .find(|(_, n)| n == loser_name)
-                        .expect("loser not found")
-                        .0;
-
-                    rename_path_in_prefix_record(
-                        &mut prefix_records[loser_idx],
-                        path,
-                        &loser_path,
-                        true,
-                    );
-                    prefix_records_to_rewrite.insert(loser_idx);
+                        .map(|(idx, _)| *idx)
+                    {
+                        rename_path_in_prefix_record(
+                            &mut prefix_records[loser_idx],
+                            path,
+                            &loser_path,
+                            true,
+                        );
+                        prefix_records_to_rewrite.insert(loser_idx);
+                    }
                 }
             }
 
             // Rename the winner
             let winner_path = clobber_name(path, &winner.1);
-            tracing::trace!("renaming {} to {}", winner_path.display(), path.display());
+            tracing::debug!("renaming {} to {}", winner_path.display(), path.display());
             fs::rename(target_prefix.join(&winner_path), target_prefix.join(path)).map_err(
                 |e| {
                     ClobberError::IoError(
@@ -835,7 +867,7 @@ mod tests {
             .with_prefix_records(&prefix_records)
             .finish();
 
-        execute_transaction(
+        let result = execute_transaction(
             transaction,
             target_prefix.path(),
             &reqwest_middleware::ClientWithMiddleware::from(reqwest::Client::new()),
@@ -845,6 +877,8 @@ mod tests {
         )
         .await;
 
+        println!("== RESULT: {:?}", result.clobbered_paths);
+
         assert_check_files(
             target_prefix.path(),
             &[
@@ -867,6 +901,90 @@ mod tests {
         );
     }
 
+    #[tokio::test]
+    async fn test_self_clobber_update() {
+        // Create a transaction
+        let repodata_record_1 = get_repodata_record(
+            get_test_data_dir().join("clobber/clobber-1-0.1.0-h4616a5c_0.tar.bz2"),
+        );
+
+        let transaction = transaction::Transaction::<PrefixRecord, RepoDataRecord> {
+            operations: vec![TransactionOperation::Install(repodata_record_1.clone())],
+            python_info: None,
+            current_python_info: None,
+            platform: Platform::current(),
+        };
+
+        // execute transaction
+        let target_prefix = tempfile::tempdir().unwrap();
+
+        let packages_dir = tempfile::tempdir().unwrap();
+        let cache = PackageCache::new(packages_dir.path());
+
+        execute_transaction(
+            transaction,
+            target_prefix.path(),
+            &reqwest_middleware::ClientWithMiddleware::from(reqwest::Client::new()),
+            &cache,
+            &InstallDriver::default(),
+            &InstallOptions::default(),
+        )
+        .await;
+
+        // check that the files are there
+        assert_check_files(
+            target_prefix.path(),
+            &["clobber.txt", "another-clobber.txt"],
+        );
+
+        let mut prefix_records = PrefixRecord::collect_from_prefix(target_prefix.path()).unwrap();
+        prefix_records.sort_by(|a, b| {
+            a.repodata_record
+                .package_record
+                .name
+                .as_normalized()
+                .cmp(b.repodata_record.package_record.name.as_normalized())
+        });
+
+        // Reinstall the same package
+        let transaction = transaction::Transaction::<PrefixRecord, RepoDataRecord> {
+            operations: vec![TransactionOperation::Change {
+                old: prefix_records[0].clone(),
+                new: repodata_record_1,
+            }],
+            python_info: None,
+            current_python_info: None,
+            platform: Platform::current(),
+        };
+
+        let install_driver = InstallDriver::builder()
+            .with_prefix_records(&prefix_records)
+            .finish();
+
+        install_driver
+            .pre_process(&transaction, target_prefix.path())
+            .unwrap();
+        let dl_client = reqwest_middleware::ClientWithMiddleware::from(reqwest::Client::new());
+        for op in &transaction.operations {
+            execute_operation(
+                target_prefix.path(),
+                &dl_client,
+                &cache,
+                &install_driver,
+                op.clone(),
+                &InstallOptions::default(),
+            )
+            .await;
+        }
+
+        // Check what files are in the prefix now (note that unclobbering wasn't run yet)
+        // But also, this is a reinstall so the files should just be overwritten.
+        assert_check_files(
+            target_prefix.path(),
+            &["clobber.txt", "another-clobber.txt"],
+        );
+    }
+
     #[tokio::test]
     async fn test_clobber_update_and_remove() {
         // Create a transaction