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

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

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

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler/Cargo.toml

@@ -11,9 +11,9 @@ license.workspace = true
 readme = "README.md"
 
 [features]
-default = ['native-tls']
-native-tls = ['reqwest/native-tls', 'rattler_package_streaming/native-tls']
-rustls-tls = ['reqwest/rustls-tls', 'rattler_package_streaming/rustls-tls']
+default = ['rustls-tls']
+native-tls = ['reqwest/native-tls', 'rattler_package_streaming/native-tls', 'rattler_cache/native-tls', 'rattler_networking/native-tls']
+rustls-tls = ['reqwest/rustls-tls', 'rattler_package_streaming/rustls-tls', 'rattler_cache/rustls-tls', 'rattler_networking/rustls-tls']
 cli-tools = ['dep:clap']
 indicatif = ['dep:indicatif', 'dep:console']
 

py_rattler-0.13.1/crates/rattler_cache/Cargo.toml

@@ -0,0 +1,54 @@
+[package]
+name = "rattler_cache"
+version = "0.3.19"
+description = "A crate to manage the caching of data in rattler"
+categories = { workspace = true }
+homepage = { workspace = true }
+repository = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+readme = "README.md"
+
+[features]
+default = ["rustls-tls"]
+rustls-tls = ["reqwest/rustls-tls", "reqwest-middleware/rustls-tls", "rattler_networking/rustls-tls", "rattler_package_streaming/rustls-tls"]
+native-tls = ["reqwest/native-tls", "rattler_networking/native-tls", "rattler_package_streaming/native-tls"]
+
+[dependencies]
+
+[target.'cfg(not( target_arch = "wasm32" ))'.dependencies]
+anyhow = { workspace = true }
+dashmap = { workspace = true }
+dirs = { workspace = true }
+futures = { workspace = true }
+fs-err = { workspace = true }
+fs4 = { workspace = true, features = ["fs-err3-tokio", "tokio"] }
+fxhash = { workspace = true }
+itertools = { workspace = true }
+parking_lot = { workspace = true }
+rattler_conda_types = { workspace = true, default-features = false }
+rattler_digest = { workspace = true, default-features = false }
+rattler_networking = { workspace = true, default-features = false }
+rattler_package_streaming = { workspace = true, default-features = false, features = ["reqwest"] }
+reqwest = { workspace = true }
+tempfile = { workspace = true }
+tokio = { workspace = true, features = ["macros"] }
+tracing = { workspace = true }
+url = { workspace = true }
+thiserror = { workspace = true }
+reqwest-middleware = { workspace = true }
+digest = { workspace = true }
+simple_spawn_blocking = { workspace = true, features = ["tokio"] }
+rayon = { workspace = true }
+serde_json = { workspace = true }
+
+[dev-dependencies]
+assert_matches = { workspace = true }
+axum = { workspace = true }
+bytes = { workspace = true }
+futures = { workspace = true }
+rstest = { workspace = true }
+tokio-stream = { workspace = true }
+tower-http = { workspace = true, features = ["fs"] }
+tools = { path = "../tools" }
+reqwest-retry = { workspace = true }

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler_conda_types/src/repo_data/sharded.rs

@@ -1,4 +1,6 @@
 //! Structs to deal with repodata "shards" which are per-package repodata files.
+
+use chrono::{DateTime, Utc};
 use fxhash::{FxHashMap, FxHashSet};
 use rattler_digest::Sha256Hash;
 use serde::{Deserialize, Serialize};
@@ -6,16 +8,19 @@ use serde::{Deserialize, Serialize};
 use crate::PackageRecord;
 
 /// The sharded repodata holds a hashmap of package name -> shard (hash).
-/// This index file is stored under `<channel>/<subdir>/repodata_shards.msgpack.zst`
+/// This index file is stored under
+/// `<channel>/<subdir>/repodata_shards.msgpack.zst`
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ShardedRepodata {
-    /// Additional information about the sharded subdirectory such as the base url.
+    /// Additional information about the sharded subdirectory such as the base
+    /// url.
     pub info: ShardedSubdirInfo,
     /// The individual shards indexed by package name.
     pub shards: FxHashMap<String, Sha256Hash>,
 }
 
-/// Information about a sharded subdirectory that is stored inside the index file.
+/// Information about a sharded subdirectory that is stored inside the index
+/// file.
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct ShardedSubdirInfo {
     /// The name of the subdirectory
@@ -27,11 +32,15 @@ pub struct ShardedSubdirInfo {
     /// This is used to construct the full url of the packages.
     pub base_url: String,
 
-    /// The base url of the individual shards. This is the location where the actual
-    /// packages are stored.
+    /// The base url of the individual shards. This is the location where the
+    /// actual packages are stored.
     ///
     /// This is used to construct the full url of the shard.
     pub shards_base_url: String,
+
+    /// The date at which this entry was created.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub created_at: Option<DateTime<Utc>>,
 }
 
 /// An individual shard that contains repodata for a single package name.

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

@@ -26,3 +26,8 @@ expression: file_urls
 - channels/dummy/linux-64/track-features-1-xxx.tar.bz2
 - channels/dummy/linux-64/track-features-2-xxx.tar.bz2
 - channels/dummy/linux-64/track-features-4-xxx.tar.bz2
+- channels/dummy/linux-64/foobar-2.0-bla_1.conda
+- 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.12.0 → py_rattler-0.13.1}/crates/rattler_conda_types/src/repo_data/snapshots/rattler_conda_types__repo_data__test__serialize_packages-2.snap

@@ -368,6 +368,80 @@ expression: json
       "version": "2"
     }
   },
-  "packages.conda": {},
+  "packages.conda": {
+    "bors-1.1-bla_1.conda": {
+      "build": "bla_1",
+      "build_number": 1,
+      "depends": [],
+      "license": "MIT",
+      "license_family": "MIT",
+      "md5": "bc13aa58e2092bcb0b97c561373d3905",
+      "name": "bors",
+      "sha256": "97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a",
+      "size": 414494,
+      "subdir": "linux-64",
+      "timestamp": 1605110689658,
+      "version": "1.1"
+    },
+    "bors-2.1-bla_1.conda": {
+      "build": "bla_1",
+      "build_number": 1,
+      "depends": [],
+      "license": "MIT",
+      "license_family": "MIT",
+      "md5": "bc13aa58e2092bcb0b97c561373d3905",
+      "name": "bors",
+      "sha256": "97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a",
+      "size": 414494,
+      "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,
+      "depends": [
+        "bors <2.0"
+      ],
+      "license": "MIT",
+      "license_family": "MIT",
+      "md5": "bc13aa58e2092bcb0b97c561373d3905",
+      "name": "foobar",
+      "sha256": "97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a",
+      "size": 414494,
+      "subdir": "linux-64",
+      "timestamp": 1605110689658,
+      "version": "2.0"
+    },
+    "issue_717-2.1-bla_1.conda": {
+      "build": "issue_717",
+      "build_number": 0,
+      "constrains": [
+        "ray[default,data] >=2.9.0,<3.0.0"
+      ],
+      "depends": [],
+      "license": "MIT",
+      "license_family": "MIT",
+      "md5": "bc13aa58e2092bcb0b97c561373d3905",
+      "name": "issue_717",
+      "sha256": "97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a",
+      "size": 414494,
+      "subdir": "linux-64",
+      "timestamp": 1715610974,
+      "version": "2.1"
+    }
+  },
   "repodata_version": 2
 }

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

@@ -333,5 +333,71 @@ packages:
     subdir: linux-64
     timestamp: 1715610974
     version: "2"
-packages.conda: {}
+packages.conda:
+  bors-1.1-bla_1.conda:
+    build: bla_1
+    build_number: 1
+    depends: []
+    license: MIT
+    license_family: MIT
+    md5: bc13aa58e2092bcb0b97c561373d3905
+    name: bors
+    sha256: 97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a
+    size: 414494
+    subdir: linux-64
+    timestamp: 1605110689658
+    version: "1.1"
+  bors-2.1-bla_1.conda:
+    build: bla_1
+    build_number: 1
+    depends: []
+    license: MIT
+    license_family: MIT
+    md5: bc13aa58e2092bcb0b97c561373d3905
+    name: bors
+    sha256: 97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a
+    size: 414494
+    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
+    depends:
+      - bors <2.0
+    license: MIT
+    license_family: MIT
+    md5: bc13aa58e2092bcb0b97c561373d3905
+    name: foobar
+    sha256: 97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a
+    size: 414494
+    subdir: linux-64
+    timestamp: 1605110689658
+    version: "2.0"
+  issue_717-2.1-bla_1.conda:
+    build: issue_717
+    build_number: 0
+    constrains:
+      - "ray[default,data] >=2.9.0,<3.0.0"
+    depends: []
+    license: MIT
+    license_family: MIT
+    md5: bc13aa58e2092bcb0b97c561373d3905
+    name: issue_717
+    sha256: 97ec377d2ad83dfef1194b7aa31b0c9076194e10d995a6e696c9d07dd782b14a
+    size: 414494
+    subdir: linux-64
+    timestamp: 1715610974
+    version: "2.1"
 repodata_version: 2

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler_networking/Cargo.toml

@@ -11,7 +11,7 @@ license.workspace = true
 readme = "README.md"
 
 [features]
-default = ["native-tls"]
+default = ["rustls-tls"]
 native-tls = ["reqwest/native-tls"]
 rustls-tls = ["reqwest/rustls-tls"]
 gcs = ["google-cloud-auth"]

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler_package_streaming/Cargo.toml

@@ -42,7 +42,7 @@ tokio = { workspace = true, features = ["fs"] }
 zstd = { workspace = true, features = ["zstdmt"] }
 
 [features]
-default = ["native-tls"]
+default = ["rustls-tls"]
 native-tls = ["rattler_networking/native-tls", "rattler_redaction/native-tls"]
 rustls-tls = ["rattler_networking/rustls-tls", "rattler_redaction/rustls-tls"]
 reqwest = ["dep:reqwest-middleware", "dep:reqwest"]

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler_repodata_gateway/Cargo.toml

@@ -43,6 +43,7 @@ rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_with = { workspace = true }
+strum = { workspace = true }
 superslice = { workspace = true, optional = true }
 
 tempfile = { workspace = true }
@@ -87,9 +88,9 @@ tower-http = { workspace = true, features = ["fs", "compression-gzip", "trace"]
 tracing-test = { workspace = true }
 
 [features]
-default = ['native-tls']
-native-tls = ['reqwest/native-tls', 'reqwest/native-tls-alpn']
-rustls-tls = ['reqwest/rustls-tls']
+default = ['rustls-tls']
+native-tls = ['reqwest/native-tls', 'reqwest/native-tls-alpn', 'rattler_networking/native-tls', 'rattler_cache/native-tls', 'rattler_redaction/native-tls']
+rustls-tls = ['reqwest/rustls-tls', 'rattler_networking/rustls-tls', 'rattler_cache/rustls-tls', 'rattler_redaction/rustls-tls']
 sparse = ["rattler_conda_types", "memmap2", "self_cell", "superslice", "itertools", "serde_json/raw_value"]
 gateway = ["sparse", "http", "http-cache-semantics", "parking_lot", "async-trait"]
 

{py_rattler-0.12.0 → py_rattler-0.13.1}/crates/rattler_repodata_gateway/src/gateway/local_subdir.rs

@@ -4,7 +4,7 @@ use rattler_conda_types::{Channel, PackageName, RepoDataRecord};
 
 use crate::{
     gateway::{error::SubdirNotFoundError, subdir::SubdirClient, GatewayError},
-    sparse::SparseRepoData,
+    sparse::{PackageFormatSelection, SparseRepoData},
     Reporter,
 };
 
@@ -73,7 +73,9 @@ impl SubdirClient for LocalSubdirClient {
         let sparse_repodata = self.sparse.clone();
         let name = name.clone();
 
-        let load_records = move || match sparse_repodata.load_records(&name) {
+        let load_records = move || match sparse_repodata
+            .load_records(&name, PackageFormatSelection::PreferConda)
+        {
             Ok(records) => Ok(records.into()),
             Err(err) => Err(GatewayError::IoError(
                 "failed to extract repodata records from sparse repodata".to_string(),
@@ -90,7 +92,7 @@ impl SubdirClient for LocalSubdirClient {
     fn package_names(&self) -> Vec<String> {
         let sparse_repodata: Arc<SparseRepoData> = self.sparse.clone();
         sparse_repodata
-            .package_names()
+            .package_names(PackageFormatSelection::PreferConda)
             .map(std::convert::Into::into)
             .collect()
     }