Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
pavelzw committed Feb 3, 2025
1 parent aaa63d0 commit 8b9dea8
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 56 deletions.
30 changes: 15 additions & 15 deletions Cargo.lock

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

22 changes: 11 additions & 11 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -369,17 +369,17 @@ tokio = { workspace = true, features = ["rt"] }


[patch.crates-io]
file_url = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_cache = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_conda_types = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_digest = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_lock = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_networking = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_repodata_gateway = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_shell = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_solve = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_virtual_packages = { git = "https://github.com/conda/rattler", ref = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
file_url = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_cache = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_conda_types = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_digest = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_lock = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_networking = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_repodata_gateway = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_shell = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_solve = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
rattler_virtual_packages = { git = "https://github.com/conda/rattler", rev = "8141e3fc3d97ffda1fce053e1611da2db3635553" }
# This is a temporary patch to get `cargo vendor` to work with the `uv` and pep508_rs` crates.
version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "57832d0588fbb7aab824813481104761dc1c7740" }

Expand Down
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
---
source: crates/pixi_manifest/src/pypi/pypi_requirement.rs
assertion_line: 1160
expression: "snapshot.into_iter().map(|Snapshot { input, result }|\nformat!(\"input: {input}\\nresult: {} \",\nresult.as_object().unwrap().get(\"error\").unwrap().as_str().unwrap())).join(\"\\n\")"
---
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]
1pkg = { 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]
1pkg = { 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 @@ -29,85 +27,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]
1pkg = { 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]
1pkg = { 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]
1pkg = { 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]
1pkg = { 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]
1pkg = { 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]
1pkg = { 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]
1pkg = "/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]
1pkg = "./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]
1pkg = "\\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]
1pkg = "~/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]
1pkg = "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]
1pkg = "https://github.com/conda-forge/21cmfast-feedstock"
· ─────────────────────────────────────────────────
Expand Down

0 comments on commit 8b9dea8

Please sign in to comment.