update rip and rattler (#798)

Co-authored-by: Tim de Jager <[email protected]>
Co-authored-by: Tim de Jager <[email protected]>

Cargo.toml

@@ -38,11 +38,11 @@ insta = { version = "1.34.0", features = ["yaml"] }
 is_executable = "1.0.1"
 itertools = "0.12.1"
 lazy_static = "1.4.0"
-miette = { version = "5.10.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
+miette = { version = "7.0.0", features = ["fancy", "supports-color", "supports-hyperlinks", "supports-unicode", "terminal_size", "textwrap"] }
 minijinja = { version = "1.0.12", features = ["builtins"] }
 once_cell = "1.19.0"
-pep440_rs = "0.3.12"
-pep508_rs = { version = "0.2.3", features = ["modern"] }
+pep440_rs = "0.4.0"
+pep508_rs = { version = "0.3.0", features = ["modern"] }
 rattler = { version = "0.17.0", default-features = false }
 rattler_conda_types = { version = "0.17.0", default-features = false }
 rattler_digest = { version = "0.17.0", default-features = false }
@@ -55,7 +55,7 @@ rattler_virtual_packages = { version = "0.17.0", default-features = false }
 regex = "1.10.3"
 reqwest = { version = "0.11.24", default-features = false }
 reqwest-middleware = "0.2.4"
-rip = { package = "rattler_installs_packages", version = "0.5.0", default-features = false }
+rip = { package = "rattler_installs_packages", version = "0.7.0", default-features = false }
 self-replace = "1.3.7"
 serde = "1.0.196"
 serde-untagged = "0.1.5"
@@ -91,15 +91,15 @@ tokio = { version = "1.36.0", features = ["rt"] }
 toml = "0.8.10"
 
 [patch.crates-io]
-#rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_lock = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
-#rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_conda_types = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_digest = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_lock = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_networking = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_shell = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_solve = { git = "https://github.com/mamba-org/rattler", branch = "main" }
+rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", branch = "main" }
 #rip = { package = "rattler_installs_packages", git = "https://github.com/prefix-dev/rattler_installs_packages", branch = "main" }
 #resolvo = { git = "https://github.com/mamba-org/resolvo.git", branch = "main" }
 #deno_task_shell = { path = "../deno_task_shell" }

src/environment.rs

@@ -1,4 +1,5 @@
 use miette::{Context, IntoDiagnostic};
+use rip::resolve::solve_options::SDistResolution;
 
 use crate::lock_file::{resolve_pypi, LockedCondaPackages, LockedPypiPackages};
 use crate::project::virtual_packages::get_minimal_virtual_packages;
@@ -34,7 +35,7 @@ use rattler_conda_types::{
 use rattler_lock::{LockFile, Package, PypiPackageData, PypiPackageEnvironmentData};
 use rattler_repodata_gateway::sparse::SparseRepoData;
 use reqwest_middleware::ClientWithMiddleware;
-use rip::{index::PackageDb, resolve::SDistResolution};
+use rip::index::PackageDb;
 use std::{
     borrow::Cow,
     collections::{HashMap, HashSet},
@@ -1563,7 +1564,7 @@ async fn spawn_solve_pypi_task(
         pb.start();
 
         let result = resolve_pypi(
-            &package_db,
+            package_db,
             dependencies,
             system_requirements,
             &repodata_records,

src/install_pypi.rs

@@ -7,6 +7,7 @@ use indexmap::IndexSet;
 use indicatif::ProgressBar;
 use itertools::Itertools;
 use miette::{IntoDiagnostic, WrapErr};
+use rip::resolve::solve_options::{ResolveOptions, SDistResolution};
 
 use crate::consts::PROJECT_MANIFEST;
 use crate::project::manifest::SystemRequirements;
@@ -22,12 +23,12 @@ use rip::python_env::{
     find_distributions_in_venv, uninstall_distribution, Distribution, PythonLocation, WheelTag,
     WheelTags,
 };
-use rip::resolve::{ResolveOptions, SDistResolution};
 use rip::types::{
-    Artifact, ArtifactHashes, ArtifactInfo, ArtifactName, Extra, NormalizedPackageName,
+    ArtifactHashes, ArtifactInfo, ArtifactName, Extra, HasArtifactName, NormalizedPackageName,
 };
 use rip::wheel_builder::WheelBuilder;
 use std::collections::{HashMap, HashSet};
+use std::ops::Deref;
 use std::path::Path;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -302,6 +303,7 @@ fn stream_python_artifacts(
                     requires_python: pkg_data.requires_python.clone(),
                     dist_info_metadata: Default::default(),
                     yanked: Default::default(),
+                    is_direct_url: false,
                 };
 
                 let wheel = tokio::spawn({
@@ -311,10 +313,10 @@ fn stream_python_artifacts(
                     let package_db = package_db.clone();
                     async move {
                         let wheel_builder = WheelBuilder::new(
-                            &package_db,
-                            &marker_environment,
-                            Some(&compatible_tags),
-                            &resolve_options,
+                            package_db.clone(),
+                            marker_environment,
+                            Some(compatible_tags),
+                            resolve_options.deref().clone(),
                             HashMap::default(),
                         )
                             .into_diagnostic()

src/lock_file/mod.rs

@@ -12,8 +12,8 @@ use miette::IntoDiagnostic;
 use rattler_conda_types::{GenericVirtualPackage, MatchSpec, Platform, RepoDataRecord};
 use rattler_lock::{LockFile, PackageHashes, PypiPackageData, PypiPackageEnvironmentData};
 use rattler_solve::{resolvo, SolverImpl};
-use rip::{index::PackageDb, resolve::SDistResolution};
-use std::path::Path;
+use rip::{index::PackageDb, resolve::solve_options::SDistResolution};
+use std::{path::Path, sync::Arc};
 
 use crate::project::manifest::{PyPiRequirement, SystemRequirements};
 pub use satisfiability::{
@@ -41,7 +41,7 @@ pub async fn load_lock_file(project: &Project) -> miette::Result<LockFile> {
 
 #[allow(clippy::too_many_arguments)]
 pub async fn resolve_pypi(
-    package_db: &PackageDb,
+    package_db: Arc<PackageDb>,
     dependencies: IndexMap<rip::types::PackageName, Vec<PyPiRequirement>>,
     system_requirements: SystemRequirements,
     locked_conda_records: &[RepoDataRecord],
@@ -54,7 +54,7 @@ pub async fn resolve_pypi(
     // Solve python packages
     pb.set_message("resolving pypi dependencies");
     let python_artifacts = pypi::resolve_dependencies(
-        package_db,
+        package_db.clone(),
         dependencies,
         system_requirements,
         platform,

src/lock_file/package_identifier.rs

@@ -226,14 +226,15 @@ pub enum ConversionError {
     Extra(String),
 }
 
-impl<'a> From<PypiPackageIdentifier> for PinnedPackage<'a> {
+impl From<PypiPackageIdentifier> for PinnedPackage {
     fn from(value: PypiPackageIdentifier) -> Self {
         PinnedPackage {
             name: value.name,
             version: value.version,
             extras: value.extras,
             // We are not aware of artifacts for conda python packages.
             artifacts: vec![],
+            url: None,
         }
     }
 }

src/lock_file/pypi.rs

@@ -9,21 +9,23 @@ use miette::{Context, IntoDiagnostic};
 use rattler_conda_types::{Platform, RepoDataRecord};
 use rip::index::PackageDb;
 use rip::python_env::PythonLocation;
-use rip::resolve::{resolve, PinnedPackage, ResolveOptions, SDistResolution};
+use rip::resolve::solve_options::{ResolveOptions, SDistResolution};
+use rip::resolve::{resolve, PinnedPackage};
 use rip::types::PackageName;
 use std::path::Path;
+use std::sync::Arc;
 use std::{collections::HashMap, vec};
 
 /// Resolve python packages for the specified project.
 pub async fn resolve_dependencies<'db>(
-    package_db: &'db PackageDb,
+    package_db: Arc<PackageDb>,
     dependencies: IndexMap<PackageName, Vec<PyPiRequirement>>,
     system_requirements: SystemRequirements,
     platform: Platform,
     conda_packages: &[RepoDataRecord],
     python_location: Option<&Path>,
     sdist_resolution: SDistResolution,
-) -> miette::Result<Vec<PinnedPackage<'db>>> {
+) -> miette::Result<Vec<PinnedPackage>> {
     if dependencies.is_empty() {
         return Ok(vec![]);
     }
@@ -85,14 +87,14 @@ pub async fn resolve_dependencies<'db>(
     let mut result = resolve(
         package_db,
         &requirements,
-        &marker_environment,
-        Some(&compatible_tags),
+        Arc::new(marker_environment),
+        Some(Arc::new(compatible_tags)),
         conda_python_packages
             .into_iter()
             .map(|p| (p.name.clone(), p))
             .collect(),
         HashMap::default(),
-        &ResolveOptions {
+        ResolveOptions {
             sdist_resolution,
             python_location,
             ..Default::default()

src/project/manifest/validation.rs

@@ -13,7 +13,7 @@ use std::{
 
 impl ProjectManifest {
     /// Validate the project manifest.
-    pub fn validate(&self, source: NamedSource, root_folder: &Path) -> miette::Result<()> {
+    pub fn validate(&self, source: NamedSource<String>, root_folder: &Path) -> miette::Result<()> {
         // Check if the targets are defined for existing platforms
         for feature in self.features.values() {
             let platforms = feature
@@ -148,7 +148,7 @@ impl ProjectManifest {
 
 // Create an error report for using a platform that is not supported by the project.
 fn create_unsupported_platform_report(
-    source: NamedSource,
+    source: NamedSource<String>,
     span: Range<usize>,
     platform: &Platform,
     feature: &Feature,

src/project/mod.rs

@@ -11,6 +11,7 @@ use once_cell::sync::OnceCell;
 use rattler_conda_types::{Channel, GenericVirtualPackage, Platform, Version};
 use rattler_networking::AuthenticationMiddleware;
 use reqwest_middleware::ClientWithMiddleware;
+use rip::index::PackageSources;
 use rip::{index::PackageDb, normalize_index_url};
 use std::hash::Hash;
 use std::{
@@ -140,7 +141,7 @@ impl Project {
 
     /// Returns the source code of the project as [`NamedSource`].
     /// Used in error reporting.
-    pub fn manifest_named_source(&self) -> NamedSource {
+    pub fn manifest_named_source(&self) -> NamedSource<String> {
         NamedSource::new(PROJECT_MANIFEST, self.manifest.contents.clone())
     }
 
@@ -366,9 +367,8 @@ impl Project {
     }
 
     /// Returns the Python index URLs to use for this project.
-    pub fn pypi_index_urls(&self) -> Vec<Url> {
-        let index_url = normalize_index_url(Url::parse("https://pypi.org/simple/").unwrap());
-        vec![index_url]
+    pub fn pypi_index_url(&self) -> Url {
+        normalize_index_url(Url::parse("https://pypi.org/simple/").unwrap())
     }
 
     /// Returns the package database used for caching python metadata, wheels and more. See the
@@ -378,11 +378,10 @@ impl Project {
             .package_db
             .get_or_try_init(|| {
                 PackageDb::new(
+                    PackageSources::from(self.pypi_index_url()),
                     self.authenticated_client().clone(),
-                    &self.pypi_index_urls(),
                     &config::get_cache_dir()?.join("pypi/"),
                 )
-                .into_diagnostic()
                 .map(Arc::new)
             })?
             .clone())