py-rattler 0.8.0__tar.gz → 0.8.2__tar.gz

{py_rattler-0.8.0 → py_rattler-0.8.2}/Cargo.lock

@@ -2462,7 +2462,7 @@ dependencies = [
 
 [[package]]
 name = "py-rattler"
-version = "0.8.0"
+version = "0.8.2"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2890,7 +2890,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_repodata_gateway"
-version = "0.21.19"
+version = "0.21.20"
 dependencies = [
  "anyhow",
  "async-compression",
@@ -2958,7 +2958,7 @@ dependencies = [
 
 [[package]]
 name = "rattler_solve"
-version = "1.2.0"
+version = "1.2.1"
 dependencies = [
  "chrono",
  "futures",
@@ -3135,9 +3135,9 @@ dependencies = [
 
 [[package]]
 name = "resolvo"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11ec9678b31efe58ba8cb322a6acf8fc85d1ee2b0f16cea5bc2c8aa990c2f8a9"
+checksum = "03fdd3aa47ae0816ce4ec203eba1330e7c96a6760cbfbee5f1d2ca6e768b50f7"
 dependencies = [
  "ahash",
  "bitvec",

{py_rattler-0.8.0 → py_rattler-0.8.2}/Cargo.toml

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

{py_rattler-0.8.0 → py_rattler-0.8.2}/PKG-INFO

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

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_repodata_gateway/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.21.20](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.21.19...rattler_repodata_gateway-v0.21.20) - 2024-11-05
+
+### Fixed
+
+- gateway recursive records ([#930](https://github.com/conda/rattler/pull/930))
+
 ## [0.21.19](https://github.com/conda/rattler/compare/rattler_repodata_gateway-v0.21.18...rattler_repodata_gateway-v0.21.19) - 2024-11-04
 
 ### Other

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_repodata_gateway/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_repodata_gateway"
-version = "0.21.19"
+version = "0.21.20"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "A crate to interact with Conda repodata"

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_repodata_gateway/src/gateway/mod.rs

@@ -532,7 +532,7 @@ mod test {
             .unwrap();
 
         let total_records_single_openssl: usize = records.iter().map(RepoData::len).sum();
-        assert_eq!(total_records_single_openssl, 4644);
+        assert_eq!(total_records_single_openssl, 4219);
 
         // There should be only one record for the openssl package.
         let openssl_records: Vec<&RepoDataRecord> = records
@@ -571,7 +571,7 @@ mod test {
         // The total number of records should be greater than the number of records
         // fetched when selecting the openssl with a direct url.
         assert!(total_records > total_records_single_openssl);
-        assert_eq!(total_records, 4692);
+        assert_eq!(total_records, 4267);
 
         let openssl_records: Vec<&RepoDataRecord> = records
             .iter()

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_repodata_gateway/src/gateway/query.rs

@@ -43,6 +43,15 @@ pub struct RepoDataQuery {
     reporter: Option<Arc<dyn Reporter>>,
 }
 
+#[derive(Clone)]
+enum SourceSpecs {
+    /// The record is required by the user.
+    Input(Vec<MatchSpec>),
+
+    /// The record is required by a dependency.
+    Transitive,
+}
+
 impl RepoDataQuery {
     /// Constructs a new instance. This should not be called directly, use
     /// [`Gateway::query`] instead.
@@ -108,10 +117,13 @@ impl RepoDataQuery {
                 direct_url_specs.push((spec.clone(), url, name));
             } else if let Some(name) = &spec.name {
                 seen.insert(name.clone());
-                pending_package_specs
+                let pending = pending_package_specs
                     .entry(name.clone())
-                    .or_insert_with(Vec::new)
-                    .push(spec);
+                    .or_insert_with(|| SourceSpecs::Input(vec![]));
+                let SourceSpecs::Input(input_specs) = pending else {
+                    panic!("RootSpecs::Input was overwritten by RootSpecs::Transitive");
+                };
+                input_specs.push(spec);
             }
         }
 
@@ -176,7 +188,7 @@ impl RepoDataQuery {
                         }
                     }
                     // Push the direct url in the first subdir result for channel priority logic.
-                    Ok((0, vec![spec], record))
+                    Ok((0, SourceSpecs::Input(vec![spec]), record))
                 }
                 .boxed(),
             );
@@ -228,9 +240,11 @@ impl RepoDataQuery {
                         // Extract the dependencies from the records and recursively add them to the
                         // list of package names that we need to fetch.
                         for record in records.iter() {
-                            if !request_specs.iter().any(|spec| spec.matches(record)) {
-                                // Do not recurse into records that do not match to root spec.
-                                continue;
+                            if let SourceSpecs::Input(request_specs) = &request_specs {
+                                if !request_specs.iter().any(|spec| spec.matches(record)) {
+                                    // Do not recurse into records that do not match to root spec.
+                                    continue;
+                                }
                             }
                             for dependency in &record.package_record.depends {
                                 // Use only the name for transitive dependencies.
@@ -238,7 +252,7 @@ impl RepoDataQuery {
                                     dependency.split_once(' ').unwrap_or((dependency, "")).0,
                                 );
                                 if seen.insert(dependency_name.clone()) {
-                                    pending_package_specs.insert(dependency_name.clone(), vec![dependency_name.into()]);
+                                    pending_package_specs.insert(dependency_name.clone(), SourceSpecs::Transitive);
                                 }
                             }
                         }
@@ -249,9 +263,11 @@ impl RepoDataQuery {
                         let result = &mut result[result_idx];
 
                         for record in records.iter() {
-                            if !self.recursive && !request_specs.iter().any(|spec| spec.matches(record)) {
-                                // Do not return records that do not match to root spec.
-                                continue;
+                            if let SourceSpecs::Input(request_specs) = &request_specs {
+                                if !request_specs.iter().any(|spec| spec.matches(record)) {
+                                    // Do not return records that do not match to input spec.
+                                    continue;
+                                }
                             }
                             result.len += 1;
                             result.shards.push(Arc::new([record.clone()]));

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_solve/CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.2.1](https://github.com/conda/rattler/compare/rattler_solve-v1.2.0...rattler_solve-v1.2.1) - 2024-11-05
+
+### Fixed
+
+- solver crash when using unrelated locked record ([#927](https://github.com/conda/rattler/pull/927))
+
+### Other
+
+- bump py-rattler to 0.8.1 ([#929](https://github.com/conda/rattler/pull/929))
+
 ## [1.2.0](https://github.com/conda/rattler/compare/rattler_solve-v1.1.0...rattler_solve-v1.2.0) - 2024-11-04
 
 ### Added

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_solve/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rattler_solve"
-version = "1.2.0"
+version = "1.2.1"
 edition= "2021"
 authors = ["Bas Zalmstra <zalmstra.bas@gmail.com>"]
 description = "A crate to solve conda environments"
@@ -26,7 +26,7 @@ tracing = "0.1.40"
 itertools = "0.13.0"
 url = { version = "2.5.2" }
 tempfile = "3.13.0"
-resolvo = { version = "0.8.3" , optional = true }
+resolvo = { version = "0.8.4" , optional = true }
 futures = { version = "0.3.31", optional = true }
 serde = { version = "1.0.214" , optional = true }
 

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_solve/src/resolvo/mod.rs

@@ -373,8 +373,6 @@ impl<'a> CondaDependencyProvider<'a> {
                         &record.channel,
                     );
                 }
-
-                candidates.hint_dependencies_available.push(solvable_id);
             }
         }
 
@@ -395,6 +393,11 @@ impl<'a> CondaDependencyProvider<'a> {
             candidates.locked = Some(solvable);
         }
 
+        // The dependencies for all candidates are always available.
+        for candidates in records.values_mut() {
+            candidates.hint_dependencies_available = candidates.candidates.clone();
+        }
+
         Ok(Self {
             pool,
             records,

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_solve/tests/snapshots/backends__resolvo__panic_on_constraint.snap

@@ -7,4 +7,4 @@ Cannot solve the request because of: The following packages are incompatible
    └─ xbar 1 would require
       └─ xfoo >=2, which can be installed with any of the following options:
          └─ xfoo 2
-├─ constraint '==1' cannot be fulfilled
+├─ the constraint xfoo ==1 cannot be fulfilled

{py_rattler-0.8.0 → py_rattler-0.8.2}/local_dependencies/rattler_solve/tests/snapshots/backends__resolvo__virtual_package_constrains.snap

@@ -1,6 +1,5 @@
 ---
 source: crates/rattler_solve/tests/backends.rs
-assertion_line: 711
 expression: output
 ---
 Cannot solve the request because of: The following packages are incompatible
@@ -8,4 +7,4 @@ Cannot solve the request because of: The following packages are incompatible
 │  └─ __cuda 1
 └─ cuda-version * cannot be installed because there are no viable options:
    └─ cuda-version 12.5 would constrain
-      └─ __cuda >=12.1 , which conflicts with any installable versions previously reported
+      └─ __cuda >=12.1, which conflicts with any installable versions previously reported

{py_rattler-0.8.0 → py_rattler-0.8.2}/rattler/networking/client.py

@@ -47,5 +47,6 @@ class Client:
         >>> Client.authenticated_client()
         Client()
         >>>
+        ```
         """
         return Client([AuthenticationMiddleware()])

{py_rattler-0.8.0 → py_rattler-0.8.2}/rattler/package/package_name.py

@@ -101,10 +101,15 @@ class PackageName:
         >>> PackageName("test-abc") == PackageName("test-ABC")
         True
         >>> PackageName("test-abc") == "test-abc"
+        True
+        >>> PackageName("test-abc") == "not-test-abc"
         False
         >>>
         ```
         """
+        if isinstance(other, str):
+            return self._name == PyPackageName(other)
+
         if not isinstance(other, PackageName):
             return False
 
@@ -124,10 +129,15 @@ class PackageName:
         >>> PackageName("test-abc") != PackageName("abc-test")
         True
         >>> PackageName("test-abc") != "test-abc"
+        False
+        >>> PackageName("test-abc") != "not-test-abc"
         True
         >>>
         ```
         """
+        if isinstance(other, str):
+            return self._name != PyPackageName(other)
+
         if not isinstance(other, PackageName):
             return True
 

{py_rattler-0.8.0 → py_rattler-0.8.2}/rattler/repo_data/gateway.py

@@ -173,6 +173,43 @@ class Gateway:
         # Convert the records into python objects
         return [[RepoDataRecord._from_py_record(record) for record in records] for records in py_records]
 
+    async def names(
+        self, channels: List[Channel | str], platforms: List[Platform | PlatformLiteral]
+    ) -> List[PackageName]:
+        """Queries all the names of packages in a channel.
+
+        Arguments:
+            channels: The channels to query.
+            platforms: The platforms to query.
+
+        Returns:
+            A list of package names that are present in the given subdirectories.
+
+        Examples
+        --------
+        ```python
+        >>> import asyncio
+        >>> gateway = Gateway()
+        >>> records = asyncio.run(gateway.names(["conda-forge"], ["linux-64"]))
+        >>> PackageName("python") in records
+        True
+        >>>
+        ```
+        """
+
+        py_package_names = await self._gateway.names(
+            channels=[
+                channel._channel if isinstance(channel, Channel) else Channel(channel)._channel for channel in channels
+            ],
+            platforms=[
+                platform._inner if isinstance(platform, Platform) else Platform(platform)._inner
+                for platform in platforms
+            ],
+        )
+
+        # Convert the records into python objects
+        return [PackageName._from_py_package_name(package_name) for package_name in py_package_names]
+
     def clear_repodata_cache(
         self, channel: Channel | str, subdirs: Optional[List[Platform | PlatformLiteral]] = None
     ) -> None:
@@ -190,10 +227,12 @@ class Gateway:
 
         Examples
         --------
+        ```python
         >>> gateway = Gateway()
         >>> gateway.clear_repodata_cache("conda-forge", ["linux-64"])
         >>> gateway.clear_repodata_cache("robostack")
         >>>
+        ```
         """
         self._gateway.clear_repodata_cache(
             channel._channel if isinstance(channel, Channel) else Channel(channel)._channel,

{py_rattler-0.8.0 → py_rattler-0.8.2}/src/repo_data/gateway.rs

@@ -1,5 +1,6 @@
 use crate::error::PyRattlerError;
 use crate::match_spec::PyMatchSpec;
+use crate::package_name::PyPackageName;
 use crate::platform::PyPlatform;
 use crate::record::PyRecord;
 use crate::{PyChannel, Wrap};
@@ -110,6 +111,28 @@ impl PyGateway {
                 .collect::<Vec<_>>())
         })
     }
+
+    pub fn names<'a>(
+        &self,
+        py: Python<'a>,
+        channels: Vec<PyChannel>,
+        platforms: Vec<PyPlatform>,
+    ) -> PyResult<Bound<'a, PyAny>> {
+        let gateway = self.inner.clone();
+        future_into_py(py, async move {
+            let names = gateway
+                .names(channels, platforms.into_iter().map(|p| p.inner))
+                .execute()
+                .await
+                .map_err(PyRattlerError::from)?;
+
+            // Convert the records into a list of lists
+            Ok(names
+                .into_iter()
+                .map(PyPackageName::from)
+                .collect::<Vec<_>>())
+        })
+    }
 }
 
 #[pyclass]

py_rattler-0.8.2/tests/unit/test_gateway.py

@@ -0,0 +1,13 @@
+import pytest
+
+from rattler import Gateway, Channel
+
+
+@pytest.mark.asyncio
+async def test_single_record_in_recursive_query(gateway: Gateway, conda_forge_channel: Channel) -> None:
+    subdirs = await gateway.query(
+        [conda_forge_channel], ["linux-64", "noarch"], ["python 3.10.0 h543edf9_1_cpython"], recursive=True
+    )
+
+    python_records = [record for subdir in subdirs for record in subdir if record.name == "python"]
+    assert len(python_records) == 1