Skip to content

Commit

Permalink
feat: allow using sharded repodata (#2467)
Browse files Browse the repository at this point in the history 
Co-authored-by: Ruben Arts <[email protected]>
  • Loading branch information
@baszalmstra @ruben-arts
baszalmstra and ruben-arts authored Nov 15, 2024
1 parent a2cb271 commit 1410864
Show file tree
Hide file tree
Showing 10 changed files with 247 additions and 388 deletions.
41 changes: 21 additions & 20 deletions Cargo.lock
View file

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

50 changes: 27 additions & 23 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,18 +96,18 @@ uv-requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.4.30"

# Rattler crates
file_url = "0.1.4"
rattler = { version = "0.28.0", default-features = false }
rattler_cache = { version = "0.2.7", default-features = false }
rattler_conda_types = { version = "0.29.0", default-features = false }
rattler_digest = { version = "1.0.2", default-features = false }
rattler_lock = { version = "0.22.29", default-features = false }
rattler = { version = "0.28.1", default-features = false }
rattler_cache = { version = "0.2.9", default-features = false }
rattler_conda_types = { version = "0.29.1", default-features = false }
rattler_digest = { version = "1.0.3", default-features = false }
rattler_lock = { version = "0.22.30", default-features = false }
rattler_networking = { version = "0.21.5", default-features = false, features = [
"google-cloud-auth",
] }
rattler_repodata_gateway = { version = "0.21.18", default-features = false }
rattler_shell = { version = "0.22.4", default-features = false }
rattler_solve = { version = "1.1.0", default-features = false }
rattler_virtual_packages = { version = "1.1.7", default-features = false }
rattler_repodata_gateway = { version = "0.21.21", default-features = false }
rattler_shell = { version = "0.22.6", default-features = false }
rattler_solve = { version = "1.2.2", default-features = false }
rattler_virtual_packages = { version = "1.1.9", default-features = false }

# Bumping this to a higher version breaks the Windows path handling.
url = "2.5.2"
Expand Down Expand Up @@ -241,7 +241,7 @@ uv-pep508 = { workspace = true }
uv-pypi-types = { workspace = true }

fs-err = { workspace = true, features = ["tokio"] }
pixi_config = { workspace = true, features = ["rattler_repodata_gateway"] }
pixi_config = { workspace = true }
pixi_consts = { workspace = true }
pixi_default_versions = { workspace = true }
pixi_manifest = { workspace = true }
Expand Down Expand Up @@ -333,26 +333,30 @@ reqwest-retry = { git = "https://github.com/TrueLayer/reqwest-middleware", rev =
# pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.4.30" }
# pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.4.30" }
# deno_task_shell = { path = "../deno_task_shell" }
# rattler = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_conda_types = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_digest = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_lock = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_networking = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_repodata_gateway = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_shell = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_solve = { git = "https://github.com/conda/rattler", branch = "main" }
# rattler_virtual_packages = { git = "https://github.com/conda/rattler", branch = "main" }

#rattler = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_cache = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_digest = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_lock = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_networking = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_package_streaming = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_shell = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_solve = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }
#rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", branch = "perf/prefix-always-sharded" }

#rattler = { path = "../rattler/crates/rattler" }
#rattler_cache = { path = "../rattler/crates/rattler_cache" }
#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
#rattler_digest = { path = "../rattler/crates/rattler_digest" }
#rattler_lock = { path = "../rattler/crates/rattler_lock" }
#rattler_networking = { path = "../rattler/crates/rattler_networking" }
#rattler_package_streaming = { path = "../rattler/crates/rattler_package_streaming" }
#rattler_repodata_gateway = { path = "../rattler/crates/rattler_repodata_gateway" }
#rattler_shell = { path = "../rattler/crates/rattler_shell" }
#rattler_solve = { path = "../rattler/crates/rattler_solve" }
#rattler_virtual_packages = { path = "../rattler/crates/rattler_virtual_packages" }
#rattler_lock = { path = "../rattler/crates/rattler_lock" }
#rattler_package_streaming = { path = "../rattler/crates/rattler_package_streaming" }
#rattler = { path = "../rattler/crates/rattler" }


# Change these lines if you want a patched version of uv
# [patch.'https://github.com/astral-sh/uv']
Expand Down
4 changes: 1 addition & 3 deletions crates/pixi_config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ miette = { workspace = true }
pixi_consts = { workspace = true }
rattler = { workspace = true }
rattler_conda_types = { workspace = true }
rattler_repodata_gateway = { workspace = true, optional = true, features = [
"gateway",
] }
rattler_repodata_gateway = { workspace = true, features = ["gateway"] }
reqwest-middleware = { workspace = true }
serde = { workspace = true }
serde_ignored = { workspace = true }
Expand Down
Loading

0 comments on commit 1410864

Please sign in to comment.