Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: split lock and add pip #378

Merged
merged 5 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions crates/rattler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ rand = "0.8.5"
rstest = "0.18.2"
tracing-test = { version = "0.2.4" }
insta = { version = "1.33.0", features = ["yaml"] }
rattler_lock = { path="../rattler_lock"}

tokio = { version = "1.32.0", features = ["macros", "rt-multi-thread"] }
axum = "0.6.20"
Expand Down
5 changes: 3 additions & 2 deletions crates/rattler/src/install/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -599,9 +599,9 @@ mod test {
};
use futures::{stream, StreamExt};
use itertools::Itertools;
use rattler_conda_types::conda_lock::CondaLock;
use rattler_conda_types::package::ArchiveIdentifier;
use rattler_conda_types::{ExplicitEnvironmentSpec, Platform, Version};
use rattler_lock::CondaLock;
use rattler_networking::AuthenticatedClient;

use std::env::temp_dir;
Expand Down Expand Up @@ -640,7 +640,8 @@ mod test {
assert!(lock.metadata.platforms.iter().contains(&current_platform), "the platform for which the explicit lock file was created does not match the current platform");

test_install_python(
lock.packages_for_platform(current_platform).map(|p| &p.url),
lock.get_packages_by_platform(current_platform)
.filter_map(|p| Some(&p.as_conda()?.url)),
"conda-lock",
current_platform,
)
Expand Down
1 change: 0 additions & 1 deletion crates/rattler_conda_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ nom = "7.1.3"
regex = "1.9.6"
serde = { version = "1.0.188", features = ["derive"] }
serde_json = "1.0.107"
serde-json-python-formatter = "0.1.0"
serde_yaml = "0.9.25"
serde_with = { version = "3.3.0", features = ["indexmap_2"] }
serde_repr = "0.1"
Expand Down
Loading
Loading