Skip to content
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
207 changes: 138 additions & 69 deletions Cargo.lock

Large diffs are not rendered by default.

55 changes: 30 additions & 25 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ exclude = [
# Only pulled in when enabling certain features. We do not want to include
# these crates when running workspace wide commands.
"crates/pixi_allocator",
# Debug output directories that don't contain Cargo.toml
"crates/pixi-build-cmake",
"crates/pixi-build-python",
# Standalone projects that should not be part of the workspace
"docs",
"examples",
Expand All @@ -18,6 +15,9 @@ exclude = [
members = ["crates/*"]
resolver = "3"

[workspace.metadata.cargo-shear]
ignored = ["pixi_compute_engine"]

[workspace.package]
authors = ["pixi contributors <hi@prefix.dev>"]
edition = "2024"
Expand All @@ -43,6 +43,7 @@ clap = { version = "4.5.31", default-features = false }
clap-verbosity-flag = "3.0.2"
clap_complete = "4.5.46"
clap_complete_nushell = "4.5.5"
cmp_any = "0.8.1"
comfy-table = "7.2.1"
console = "0.16.1"
console-subscriber = "0.5.0"
Expand Down Expand Up @@ -80,13 +81,14 @@ libc = { version = "0.2.170", default-features = false }
memchr = "2.7.4"
miette = { version = "7.6.0" }
minijinja = "2.15.1"
nanoid = "0.4.0"
nix = { version = "0.29.0", default-features = false }
once_cell = "1.20.3"
ordermap = "1.0.0"
parking_lot = "0.12.4"
pathdiff = "0.2.3"
pep440_rs = "0.7.3"
pep508_rs = "0.9.2"
pep508_rs = { version = "0.9.2", features = ["non-pep508-extensions"] }
percent-encoding = "2.3.1"
pin-project-lite = "0.2.16"
pixi_allocator = { path = "crates/pixi_allocator" }
Expand All @@ -100,6 +102,7 @@ pixi_build_type_conversions = { path = "crates/pixi_build_type_conversions" }
pixi_build_types = { path = "crates/pixi_build_types" }
pixi_cli = { path = "crates/pixi_cli" }
pixi_command_dispatcher = { path = "crates/pixi_command_dispatcher" }
pixi_compute_engine = { path = "crates/pixi_compute_engine" }
pixi_config = { path = "crates/pixi_config" }
pixi_consts = { path = "crates/pixi_consts" }
pixi_core = { path = "crates/pixi_core" }
Expand Down Expand Up @@ -130,7 +133,6 @@ pixi_variant = { path = "crates/pixi_variant" }
pypi_mapping = { path = "crates/pypi_mapping" }
pypi_modifiers = { path = "crates/pypi_modifiers" }
pyproject-toml = "0.13.7"
rand = { version = "0.10.0", default-features = false }

rayon = "1.10.0"
regex = "1.11.1"
Expand Down Expand Up @@ -169,6 +171,7 @@ tempfile = "3.17.1"
text_trees = "0.1.2"
thiserror = "2.0.12"
tokio = "1.43.0"
tokio-test = "0.4.5"
tokio-util = "0.7.13"
toml = "1.0.0"
toml-span = "0.7.0"
Expand Down Expand Up @@ -216,29 +219,28 @@ zip = { version = "8.0.0", default-features = false }
zstd = { version = "0.13.3", default-features = false }

# Rattler crates
coalesced_map = "0.1.2"
file_url = "0.2.7"
rattler = { version = "0.40.3", default-features = false }
rattler_cache = { version = "0.6.18", default-features = false }
rattler_conda_types = { version = "0.45.0", default-features = false, features = [
file_url = "0.3.0"
rattler = { version = "0.41.0", default-features = false }
rattler_cache = { version = "0.7.0", default-features = false }
rattler_conda_types = { version = "0.46.0", default-features = false, features = [
"rayon",
] }
rattler_digest = { version = "1.2.3", default-features = false }
rattler_index = { version = "0.28.0", default-features = false, features = [
"s3",
] }
rattler_lock = { version = "0.28.0", default-features = false }
rattler_lock = { version = "0.29.0", default-features = false }
rattler_menuinst = { version = "0.2.53", default-features = false }
rattler_networking = { version = "0.26.6", default-features = false, features = [
"dirs",
"google-cloud-auth",
] }
rattler_package_streaming = { version = "0.24.6", default-features = false }
rattler_repodata_gateway = { version = "0.27.3", default-features = false }
rattler_package_streaming = { version = "0.25.0", default-features = false }
rattler_repodata_gateway = { version = "0.28.0", default-features = false }
rattler_s3 = { version = "0.1.29", default-features = false }
rattler_shell = { version = "0.26.6", default-features = false }
rattler_solve = { version = "6.0.0", default-features = false }
rattler_upload = { version = "0.5.3", default-features = false, features = [
rattler_upload = { version = "0.6.0", default-features = false, features = [
"s3",
"sigstore-sign",
] }
Expand All @@ -261,17 +263,20 @@ reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev =
version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" }

# Temporary patch: rattler-build main has been updated to use the new rattler
# versions (rattler_conda_types 0.45, rattler_solve 6.0, etc.) but no release
# has been published yet. Remove once rattler-build cuts a new release.
rattler_build_core = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_jinja = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_recipe = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_types = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_variant_config = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_networking = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_script = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_source_cache = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
rattler_build_yaml_parser = { git = "https://github.com/prefix-dev/rattler-build", rev = "ca5ec28" }
# versions but no release has been published yet. Remove once rattler-build
# cuts a new release.
rattler_build_core = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_jinja = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_recipe = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_types = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_variant_config = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_networking = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_script = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_source_cache = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }
rattler_build_yaml_parser = { git = "https://github.com/prefix-dev/rattler-build", branch = "main" }

[patch."https://github.com/prefix-dev/rattler-build"]
#rattler-build = { path = "/var/home/tobias/src/rattler-build" }

[profile.ci]
codegen-units = 16
Expand Down
23 changes: 15 additions & 8 deletions crates/pixi/tests/integration_rust/add_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -810,10 +810,11 @@ preview = ['pixi-build']
.unwrap();

let lock = pixi.lock_file().await.unwrap();
let p = lock.platform(&Platform::Win64.to_string()).unwrap();
let git_package = lock
.default_environment()
.unwrap()
.packages(Platform::Win64)
.packages(p)
.unwrap()
.find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));

Expand Down Expand Up @@ -864,10 +865,11 @@ preview = ['pixi-build']
.unwrap();

let lock = pixi.lock_file().await.unwrap();
let p = lock.platform(&Platform::Linux64.to_string()).unwrap();
let git_package = lock
.default_environment()
.unwrap()
.packages(Platform::Linux64)
.packages(p)
.unwrap()
.find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));

Expand Down Expand Up @@ -923,10 +925,11 @@ preview = ['pixi-build']"#,

// Check the lock file
let lock = pixi.lock_file().await.unwrap();
let p = lock.platform(&Platform::Linux64.to_string()).unwrap();
let git_package = lock
.default_environment()
.unwrap()
.packages(Platform::Linux64)
.packages(p)
.unwrap()
.find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));

Expand Down Expand Up @@ -979,10 +982,11 @@ preview = ['pixi-build']"#,

// Check the lock file
let lock = pixi.lock_file().await.unwrap();
let p = lock.platform(&Platform::Win64.to_string()).unwrap();
let git_package = lock
.default_environment()
.unwrap()
.packages(Platform::Win64)
.packages(p)
.unwrap()
.find(|p| p.as_conda().unwrap().location().as_str().contains("git+"));

Expand Down Expand Up @@ -1082,19 +1086,22 @@ platforms = ["{platform}"]
});

let lock_file = pixi.lock_file().await.unwrap();
let p = lock_file
.platform(&Platform::current().to_string())
.unwrap();

let (boltons, _) = lock_file
let boltons = lock_file
.default_environment()
.unwrap()
.pypi_packages(Platform::current())
.pypi_packages(p)
.unwrap()
.find(|(p, _)| p.name.to_string() == "boltons")
.find(|p| p.name().to_string() == "boltons")
.unwrap();

insta::with_settings!( {filters => vec![
(r"#([a-f0-9]+)", "#[FULL_COMMIT]"),
]}, {
insta::assert_snapshot!(boltons.location);
insta::assert_snapshot!(boltons.location());
});
}

Expand Down
Loading