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
885 changes: 509 additions & 376 deletions Cargo.lock

Large diffs are not rendered by default.

100 changes: 50 additions & 50 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,85 +19,85 @@ ahash = "0.8.11"
assert_matches = "1.5.0"
async-fd-lock = "0.2.0"
async-once-cell = "0.5.4"
async-trait = "0.1.83"
async-trait = "0.1.86"
base64 = "0.22.1"
bytes = "1.9.0"
chrono = "0.4.39"
clap = { version = "4.5.23", default-features = false }
bytes = "1.10.0"
chrono = "0.4.40"
clap = { version = "4.5.31", default-features = false }
clap-verbosity-flag = "3.0.2"
clap_complete = "4.5.40"
clap_complete_nushell = "4.5.4"
clap_complete = "4.5.46"
clap_complete_nushell = "4.5.5"
concat-idents = "1.1.5"
console = "0.15.10"
crossbeam-channel = "0.5.14"
csv = "1.3.1"
ctrlc = "3.4.5"
dashmap = "6.1.0"
deno_task_shell = "0.20.2"
deno_task_shell = "0.20.3"
dialoguer = "0.11.0"
digest = "0.10"
dirs = "5.0.1"
dirs = "6.0.0"
dunce = "1.0.5"
fd-lock = "4.0.2"
flate2 = "1.0.35"
fs-err = { version = "3.0.0" }
flate2 = "1.1.0"
fs-err = { version = "3.1.0" }
fs_extra = "1.3.0"
futures = "0.3.31"
hex = "0.4.3"
http = "1.2.0"
http-cache-reqwest = "0.15.0"
http-cache-reqwest = "0.15.1"
human_bytes = "0.4.3"
humantime = "2.1.0"
ignore = "0.4.23"
indexmap = "2.7.0"
indicatif = "0.17.9"
insta = "1.41.1"
indexmap = "2.7.1"
indicatif = "0.17.11"
insta = "1.42.1"
is_executable = "1.0.4"
itertools = "0.13.0"
itertools = "0.14.0"
jsonrpsee = "=0.24.2"
libc = { version = "0.2.169", default-features = false }
libc = { version = "0.2.170", default-features = false }
memchr = "2.7.4"
miette = { version = "7.4.0" }
minijinja = "2.5.0"
miette = { version = "7.5.0" }
minijinja = "2.7.0"
nix = { version = "0.29.0", default-features = false }
once_cell = "1.20.2"
once_cell = "1.20.3"
parking_lot = "0.12.3"
pathdiff = "0.2.3"
pep440_rs = "0.7.3"
pep508_rs = "0.9.1"
pep508_rs = "0.9.2"
percent-encoding = "2.3.1"
pyproject-toml = "0.13.4"
regex = "1.11.1"
reqwest = { version = "0.12.9", default-features = false }
reqwest = { version = "0.12.12", default-features = false }
reqwest-middleware = "0.4"
reqwest-retry = "0.7.0"
rlimit = "0.10.2"
rstest = "0.23.0"
rstest = "0.24.0"
self-replace = "1.5.0"
serde = "1.0.216"
serde = "1.0.218"
serde-untagged = "0.1.6"
serde-value = "0.7.0"
serde_ignored = "0.1.10"
serde_json = "1.0.134"
serde_with = "3.11.0"
serde_json = "1.0.139"
serde_with = "3.12.0"
serde_yaml = "0.9.34"
sha1 = "0.10.6"
sha2 = "0.10.6"
sha2 = "0.10.8"
shlex = "1.3.0"
signal-hook = "0.3.17"
spdx = "0.10.7"
spdx = "0.10.8"
strsim = "0.11.1"
strum = "0.26.3"
tabwriter = "1.4.0"
tar = "0.4.43"
strum = "0.27.1"
tabwriter = "1.4.1"
tar = "0.4.44"
temp-env = { version = "0.3.6", features = ["async_closure"] }
tempfile = "3.14.0"
thiserror = "2.0.9"
tokio = "1.42.0"
tempfile = "3.17.1"
thiserror = "2.0.11"
tokio = "1.43.0"
tokio-stream = "0.1.17"
tokio-util = "0.7.13"
toml-span = "0.4.1"
toml_edit = "0.22.22"
toml_edit = "0.22.24"
tracing = "0.1.41"
tracing-subscriber = "0.3.19"
typed-path = "0.10.0"
Expand All @@ -112,24 +112,24 @@ uv-pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.6.1" }
uv-requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.6.1" }

wax = "0.6.0"
which = "7.0.1"
which = "7.0.2"

# Rattler crates
file_url = "0.2.2"
rattler = { version = "0.32.0", default-features = false }
rattler_cache = { version = "0.3.9", default-features = false }
rattler_conda_types = { version = "0.30.3", default-features = false, features = [
file_url = "0.2.3"
rattler = { version = "0.32.3", default-features = false }
rattler_cache = { version = "0.3.12", default-features = false }
rattler_conda_types = { version = "0.31.2", default-features = false, features = [
"rayon",
] }
rattler_digest = { version = "1.0.6", default-features = false }
rattler_lock = { version = "0.22.43", default-features = false }
rattler_networking = { version = "0.22.4", default-features = false, features = [
rattler_digest = { version = "1.0.7", default-features = false }
rattler_lock = { version = "0.22.46", default-features = false }
rattler_networking = { version = "0.22.7", default-features = false, features = [
"google-cloud-auth",
] }
rattler_repodata_gateway = { version = "0.21.37", default-features = false }
rattler_shell = { version = "0.22.19", default-features = false }
rattler_solve = { version = "1.3.8", default-features = false }
rattler_virtual_packages = { version = "2.0.3", default-features = false }
rattler_repodata_gateway = { version = "0.21.40", default-features = false }
rattler_shell = { version = "0.22.22", default-features = false }
rattler_solve = { version = "1.3.11", default-features = false }
rattler_virtual_packages = { version = "2.0.6", default-features = false }


# Bumping this to a higher version breaks the Windows path handling.
Expand All @@ -149,9 +149,9 @@ uv-requirements = { git = "https://github.com/astral-sh/uv", tag = "0.6.1" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.6.1" }
uv-types = { git = "https://github.com/astral-sh/uv", tag = "0.6.1" }
winapi = { version = "0.3.9", default-features = false }
xxhash-rust = "0.8.13"
zip = { version = "2.2.2", default-features = false }
zstd = { version = "0.13.2", default-features = false }
xxhash-rust = "0.8.15"
zip = { version = "2.2.3", default-features = false }
zstd = { version = "0.13.3", default-features = false }

fancy_display = { path = "crates/fancy_display" }
pixi_allocator = { path = "crates/pixi_allocator" }
Expand Down Expand Up @@ -367,7 +367,7 @@ strip = false

[dev-dependencies]
async-trait = { workspace = true }
fake = "3.0.1"
fake = "4.0.0"
http = { workspace = true }
insta = { workspace = true, features = ["yaml", "glob", "filters"] }
rstest = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/pixi_manifest/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ miette = { workspace = true, features = ["fancy-no-backtrace"] }
[dev-dependencies]
assert_matches = { workspace = true }
fancy_display = { workspace = true }
glob = "0.3.1"
glob = "0.3.2"
insta = { workspace = true, features = ["yaml"] }
miette = { workspace = true, features = ["fancy-no-backtrace"] }
rstest = { workspace = true }
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,23 @@
---
source: crates/pixi_manifest/src/pypi/pypi_requirement.rs
expression: "snapshot.into_iter().map(|Snapshot { input, result }|\nformat!(\"input: {input}\\nresult: {} \",\nresult.as_object().unwrap().get(\"error\").unwrap().as_str().unwrap())).join(\"\\n\")"
snapshot_kind: text
---
input: pkg = { ver = "1.2.3" }
result:
× Unexpected keys, expected only 'version', 'extras', 'path', 'editable', 'git', 'branch', 'tag', 'rev', 'url', 'subdirectory', 'index'
result: × Unexpected keys, expected only 'version', 'extras', 'path', 'editable', 'git', 'branch', 'tag', 'rev', 'url', 'subdirectory', 'index'
╭─[pixi.toml:1:9]
1 │ pkg = { ver = "1.2.3" }
· ─┬─
· ╰── 'ver' was not expected here
╰────
help: Did you mean 'version'?
input: pkg = { path = "foobar", "version" = "==1.2.3" }
result:
× `version` cannot be used with `path`
result: × `version` cannot be used with `path`
╭─[pixi.toml:1:7]
1 │ pkg = { path = "foobar", "version" = "==1.2.3" }
· ──────────────────────────────────────────
╰────
input: pkg = { version = "//" }
result:
× Failed to parse version: Unexpected end of version specifier, expected operator:
result: × Failed to parse version: Unexpected end of version specifier, expected operator:
│ //
│ ^^

Expand All @@ -30,85 +26,73 @@ result:
· ──
╰────
input: pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", tag = "v1" }
result:
× Only one of `branch` or `tag` or `rev` can be specified
result: × Only one of `branch` or `tag` or `rev` can be specified
╭─[pixi.toml:1:7]
1 │ pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", tag = "v1" }
· ──────────────────────────────────────────────────────────────────────────────────────────
╰────
input: pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", tag = "v1", "rev" = "123456" }
result:
× Only one of `branch` or `tag` or `rev` can be specified
result: × Only one of `branch` or `tag` or `rev` can be specified
╭─[pixi.toml:1:7]
1 │ pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", tag = "v1", "rev" = "123456" }
· ────────────────────────────────────────────────────────────────────────────────────────────────────────────
╰────
input: pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", rev = "v1" }
result:
× Only one of `branch` or `tag` or `rev` can be specified
result: × Only one of `branch` or `tag` or `rev` can be specified
╭─[pixi.toml:1:7]
1 │ pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", branch = "main", rev = "v1" }
· ──────────────────────────────────────────────────────────────────────────────────────────
╰────
input: pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", tag = "v1", rev = "123456" }
result:
× Only one of `branch` or `tag` or `rev` can be specified
result: × Only one of `branch` or `tag` or `rev` can be specified
╭─[pixi.toml:1:7]
1 │ pkg = { git = "https://github.com/conda-forge/21cmfast-feedstock", tag = "v1", rev = "123456" }
· ─────────────────────────────────────────────────────────────────────────────────────────
╰────
input: pkg = { git = "ssh://github.com:conda-forge/21cmfast-feedstock"}
result:
× invalid port number
result: × invalid port number
╭─[pixi.toml:1:16]
1 │ pkg = { git = "ssh://github.com:conda-forge/21cmfast-feedstock"}
· ───────────────────────────────────────────────
╰────
input: pkg = { branch = "main", tag = "v1", rev = "123456" }
result:
× `branch`, `rev`, and `tag` are only valid when `git` is specified
result: × `branch`, `rev`, and `tag` are only valid when `git` is specified
╭─[pixi.toml:1:7]
1 │ pkg = { branch = "main", tag = "v1", rev = "123456" }
· ────────────────────────────────────────────────
╰────
input: pkg = "/path/style"
result:
× it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "/path/style" }'
result: × it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "/path/style" }'
╭─[pixi.toml:1:8]
1 │ pkg = "/path/style"
· ───────────
╰────
input: pkg = "./path/style"
result:
× it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "./path/style" }'
result: × it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "./path/style" }'
╭─[pixi.toml:1:8]
1 │ pkg = "./path/style"
· ────────────
╰────
input: pkg = "\\path\\style"
result:
× it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "/path/style" }'
result: × it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "/path/style" }'
╭─[pixi.toml:1:8]
1 │ pkg = "//path//style"
· ─────────────
╰────
input: pkg = "~/path/style"
result:
× it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "~/path/style" }'
result: × it seems you're trying to add a path dependency, please specify as a table with a `path` key: '{ path = "~/path/style" }'
╭─[pixi.toml:1:8]
1 │ pkg = "~/path/style"
· ────────────
╰────
input: pkg = "https://example.com"
result:
× it seems you're trying to add a url dependency, please specify as a table with a `url` key: '{ url = "https://example.com" }'
result: × it seems you're trying to add a url dependency, please specify as a table with a `url` key: '{ url = "https://example.com" }'
╭─[pixi.toml:1:8]
1 │ pkg = "https://example.com"
· ───────────────────
╰────
input: pkg = "https://github.com/conda-forge/21cmfast-feedstock"
result:
× it seems you're trying to add a git dependency, please specify as a table with a `git` key: '{ git = "https://github.com/conda-forge/21cmfast-feedstock" }'
result: × it seems you're trying to add a git dependency, please specify as a table with a `git` key: '{ git = "https://github.com/conda-forge/21cmfast-feedstock" }'
╭─[pixi.toml:1:8]
1 │ pkg = "https://github.com/conda-forge/21cmfast-feedstock"
· ─────────────────────────────────────────────────
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
source: crates/pixi_manifest/src/toml/feature.rs
expression: "expect_parse_warnings(r#\"\n [workspace]\n name = \"test\"\n channels = []\n platforms = ['win-64', 'osx-arm64']\n\n [feature.foo]\n platforms = ['win-64']\n\n [feature.foo.target.osx.dependencies]\n \"#,)"
snapshot_kind: text
---
⚠ The target selector 'osx' does not match any of the platforms supported by the feature 'foo'
╭─[pixi.toml:10:29]
Expand All @@ -17,7 +16,6 @@ snapshot_kind: text
╰────
help: Add one of 'osx-64', 'osx-arm64' to the supported platforms, using `pixi project platform add osx-64`


⚠ The feature 'foo' is defined but not used in any environment
╭─[pixi.toml:7:18]
6 │
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---
source: crates/pixi_manifest/src/toml/feature.rs
expression: "expect_parse_warnings(r#\"\n [workspace]\n name = \"test\"\n channels = []\n platforms = ['win-64']\n\n [feature.foo.target.osx-64.dependencies]\n \"#,)"
snapshot_kind: text
---
⚠ The target selector 'osx-64' does not match any of the platforms supported by the workspace
╭─[pixi.toml:7:29]
Expand All @@ -17,7 +16,6 @@ snapshot_kind: text
╰────
help: Add osx-64 to the supported platforms, using `pixi project platform add osx-64`


⚠ The feature 'foo' is defined but not used in any environment
╭─[pixi.toml:7:18]
6 │
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ expression: "expect_parse_warnings(r#\"\n [workspace]\n name = \"f
╰────
help: Remove the feature from the manifest or add it to an environment


⚠ The feature 'generic' is defined but not used in any environment
╭─[pixi.toml:9:18]
8 │
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
---
source: src/lock_file/virtual_packages.rs
expression: "format!(\"With override:\\n{}\\nWithout override:\\n{}\",\nerror_to_snapshot(&error1), error_to_snapshot(&error2))"
snapshot_kind: text
---
With override:

× Virtual package '__glibc >=2.28' does not match any of the available virtual packages on your
│ machine: [__glibc=2.17, __cuda=11.8, __osx=10.14]
help: You can mock the virtual package by overriding the environment variable, e.g.:
'`CONDA_OVERRIDE_GLIBC=2.17`'

Without override:

× Virtual package '__win >=1.2.3' does not match any of the available virtual packages on your
│ machine: [__glibc=2.17, __cuda=11.8, __osx=10.14]
Loading