py-rattler 0.13.0__tar.gz → 0.13.1__tar.gz

{py_rattler-0.13.0 → py_rattler-0.13.1}/PKG-INFO

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

{py_rattler-0.13.0 → py_rattler-0.13.1}/crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__base_url_packages.snap

@@ -30,3 +30,4 @@ expression: file_urls
 - channels/dummy/linux-64/bors-2.1-bla_1.conda
 - channels/dummy/linux-64/issue_717-2.1-bla_1.conda
 - channels/dummy/linux-64/bors-1.1-bla_1.conda
+- channels/dummy/linux-64/conda-only-0.1.0-foobar_0.conda

{py_rattler-0.13.0 → py_rattler-0.13.1}/crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__serialize_packages-2.snap

@@ -397,6 +397,18 @@ expression: json
       "timestamp": 1715610974,
       "version": "2.1"
     },
+    "conda-only-0.1.0-foobar_0.conda": {
+      "build": "foobar",
+      "build_number": 0,
+      "depends": [],
+      "md5": "bc13aa58e2092bcb0b97c561373d3905",
+      "name": "conda-only",
+      "sha256": "97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a",
+      "size": 414494,
+      "subdir": "linux-64",
+      "timestamp": 1715610974,
+      "version": "0.1.0"
+    },
     "foobar-2.0-bla_1.conda": {
       "build": "bla_1",
       "build_number": 1,

{py_rattler-0.13.0 → py_rattler-0.13.1}/crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__serialize_packages.snap

@@ -360,6 +360,17 @@ packages.conda:
     subdir: linux-64
     timestamp: 1715610974
     version: "2.1"
+  conda-only-0.1.0-foobar_0.conda:
+    build: foobar
+    build_number: 0
+    depends: []
+    md5: bc13aa58e2092bcb0b97c561373d3905
+    name: conda-only
+    sha256: 97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a
+    size: 414494
+    subdir: linux-64
+    timestamp: 1715610974
+    version: 0.1.0
   foobar-2.0-bla_1.conda:
     build: bla_1
     build_number: 1

{py_rattler-0.13.0 → py_rattler-0.13.1}/crates/rattler_repodata_gateway/src/sparse/mod.rs

@@ -201,12 +201,11 @@ impl SparseRepoData {
         &self,
         package_format_selection: PackageFormatSelection,
     ) -> impl Iterator<Item = &'_ str> {
-        let repo_data = self.inner.borrow_repo_data();
-
         fn select_package_name<'i>((filename, _): &(PackageFilename<'i>, &'i RawValue)) -> &'i str {
             filename.package
         }
 
+        let repo_data = self.inner.borrow_repo_data();
         let tar_baz2_packages = repo_data.packages.iter().map(select_package_name);
         let conda_packages = repo_data.conda_packages.iter().map(select_package_name);
 
@@ -226,12 +225,19 @@ impl SparseRepoData {
         match package_format_selection {
             PackageFormatSelection::PreferConda => {
                 let repo_data = self.inner.borrow_repo_data();
-                let tar_baz2_packages = repo_data.packages.iter().map(|(name, _)| name.package);
-                let conda_packages = repo_data
-                    .conda_packages
-                    .iter()
-                    .map(|(name, _)| name.package);
-                tar_baz2_packages.merge(conda_packages).dedup().count()
+                let tar_bz2_packages = repo_data.packages.iter().map(|(filename, _)| {
+                    filename
+                        .filename
+                        .strip_suffix(ArchiveType::TarBz2.extension())
+                        .unwrap_or(filename.filename)
+                });
+                let conda_packages = repo_data.conda_packages.iter().map(|(filename, _)| {
+                    filename
+                        .filename
+                        .strip_suffix(ArchiveType::Conda.extension())
+                        .unwrap_or(filename.filename)
+                });
+                conda_packages.merge(tar_bz2_packages).dedup().count()
             }
             PackageFormatSelection::Both => {
                 self.inner.borrow_repo_data().packages.len()
@@ -1024,7 +1030,7 @@ mod test {
     #[case::prefer_conda(PackageFormatSelection::PreferConda)]
     #[case::only_tar_bz2(PackageFormatSelection::OnlyTarBz2)]
     #[case::only_conda(PackageFormatSelection::OnlyConda)]
-    fn test_only_conda(#[case] variant: PackageFormatSelection) {
+    fn test_package_format_selection(#[case] variant: PackageFormatSelection) {
         let (channel, platform, path) = dummy_repo_data();
         let sparse = SparseRepoData::from_file(channel, platform, path, None).unwrap();
         let records = sparse
@@ -1039,6 +1045,18 @@ mod test {
         });
     }
 
+    #[rstest]
+    #[case::both(PackageFormatSelection::Both, 29)]
+    #[case::prefer_conda(PackageFormatSelection::PreferConda, 25)]
+    #[case::only_tar_bz2(PackageFormatSelection::OnlyTarBz2, 24)]
+    #[case::only_conda(PackageFormatSelection::OnlyConda, 5)]
+    fn test_record_count(#[case] variant: PackageFormatSelection, #[case] expected_count: usize) {
+        let (channel, platform, path) = dummy_repo_data();
+        let sparse = SparseRepoData::from_file(channel, platform, path, None).unwrap();
+        let count = sparse.record_count(variant);
+        assert_eq!(count, expected_count);
+    }
+
     #[test]
     fn test_query() {
         let (channel, platform, path) = dummy_repo_data();

{py_rattler-0.13.0 → py_rattler-0.13.1}/py-rattler/Cargo.lock

@@ -3484,7 +3484,7 @@ dependencies = [
 
 [[package]]
 name = "py-rattler"
-version = "0.13.0"
+version = "0.13.1"
 dependencies = [
  "anyhow",
  "chrono",

{py_rattler-0.13.0 → py_rattler-0.13.1}/py-rattler/Cargo.toml

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