Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
56078f9
add proper condition parsing and proper translation to resolvo
wolfv Jul 22, 2025
eb36840
use resolvo from branch
wolfv Jul 23, 2025
2347e7a
fix up
wolfv Jul 23, 2025
5671b38
fix all lint issues
wolfv Jul 23, 2025
8f57c26
switch to resolvo 0.10.0
wolfv Jul 23, 2025
018e6fe
remove debug println
wolfv Jul 23, 2025
35d2eb5
remove more println!
wolfv Jul 23, 2025
b81ed9f
Merge branch 'main' into resolvo-condition
wolfv Jul 23, 2025
8bfe3c1
improve error handling;
wolfv Jul 23, 2025
77c47cf
merge & reset
wolfv Aug 13, 2025
170c937
implement passing conditions to resolvo
wolfv Aug 13, 2025
1294405
make it work for extras in conditions
wolfv Aug 13, 2025
4b5e965
fix clippy
wolfv Aug 13, 2025
aeab7a0
update parser
wolfv Aug 13, 2025
7f6c122
Merge remote-tracking branch 'origin/main' into resolvo-condition
wolfv Aug 13, 2025
867b26e
merge
wolfv Aug 13, 2025
6c1770d
fix lint
wolfv Aug 14, 2025
da4abdd
prevent double semicolon
wolfv Aug 14, 2025
9ead4c8
merge main
wolfv Aug 14, 2025
030687a
put the parsing behind a feature flag
wolfv Aug 15, 2025
a6845ff
fmt
wolfv Aug 15, 2025
c84f77f
fix some compilation errorrs
wolfv Aug 20, 2025
22bd21d
resolve cargo.lock issues
wolfv Aug 20, 2025
bf217b7
cleanup
baszalmstra Oct 31, 2025
2a02183
regenerate lockfile and merge main
wolfv Oct 31, 2025
c1bfbff
Merge upstream/main into resolvo-condition branch
baszalmstra Nov 4, 2025
3ad5938
Add Serialize derive to Statement test struct
baszalmstra Nov 4, 2025
2f07919
Fix clippy uninlined_format_args warnings
baszalmstra Nov 4, 2025
2b43623
fix clippy
baszalmstra Nov 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/rust-compile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ env:
RUST_BACKTRACE: 1
RUSTFLAGS: "-D warnings"
CARGO_TERM_COLOR: always
DEFAULT_FEATURES: indicatif,tokio,serde,reqwest,sparse,gateway,resolvo,libsolv_c,s3,experimental_extras,edit,rattler_config
DEFAULT_FEATURES: indicatif,tokio,serde,reqwest,sparse,gateway,resolvo,libsolv_c,s3,experimental_extras,experimental_conditionals,edit,rattler_config

jobs:
check-rustdoc-links:
Expand Down
110 changes: 52 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/rattler_conda_types/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ readme.workspace = true

[features]
default = ["rayon"]
experimental_extras = []
experimental_extras = ["experimental_conditionals"]
experimental_conditionals = []

[dependencies]
ahash = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion crates/rattler_conda_types/src/channel/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ impl serde::Serialize for NamedChannelOrUrl {
}

/// `Channel`s are the primary source of package information.
#[derive(Debug, Clone, Serialize, Eq, PartialEq, Hash)]
#[derive(Debug, Clone, Serialize, Eq, PartialEq, Hash, Deserialize)]
pub struct Channel {
/// The platforms supported by this channel, or None if no explicit
/// platforms have been specified.
Expand All @@ -198,6 +198,7 @@ pub struct Channel {
pub base_url: ChannelUrl,

/// The name of the channel
#[serde(skip_serializing_if = "Option::is_none")]
pub name: Option<String>,
}

Expand Down
2 changes: 2 additions & 0 deletions crates/rattler_conda_types/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ pub use explicit_environment_spec::{
ParseExplicitEnvironmentSpecError, ParsePackageArchiveHashError,
};
pub use generic_virtual_package::GenericVirtualPackage;
#[cfg(feature = "experimental_conditionals")]
pub use match_spec::condition::MatchSpecCondition;
pub use match_spec::{
matcher::{StringMatcher, StringMatcherParseError},
parse::ParseMatchSpecError,
Expand Down
Loading
Loading