Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: use the gateway to fetch repodata #1307

Merged
merged 14 commits into from
May 14, 2024
Merged

feat: use the gateway to fetch repodata #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
628bdf4
feat: use the gateway to fetch repodata
baszalmstra Apr 30, 2024
04c25c5
bump: latest and greatest
baszalmstra Apr 30, 2024
7b614d7
Merge remote-tracking branch 'upstream/main' into feat/gateway
baszalmstra Apr 30, 2024
92cb854
feat: update to latest
baszalmstra May 2, 2024
b5b58bb
feat: progress reporting
baszalmstra May 2, 2024
8252641
fix: deadlock issue
baszalmstra May 6, 2024
415e93d
Merge remote-tracking branch 'upstream/main' into feat/gateway
baszalmstra May 6, 2024
f1b2195
fix: reset lock-files
baszalmstra May 6, 2024
3162f90
fix: update to latest rattler branch
baszalmstra May 7, 2024
1e88f6b
fix: memory leak
baszalmstra May 7, 2024
2fc4837
chore: bump rattler
baszalmstra May 8, 2024
8dc8a09
Merge remote-tracking branch 'upstream/main' into feat/gateway
baszalmstra May 14, 2024
026e8bb
fix: test
baszalmstra May 14, 2024
726107a
Update src/lock_file/update.rs
ruben-arts May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
93 changes: 64 additions & 29 deletions Cargo.lock
View file
Open in desktop

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

36 changes: 20 additions & 16 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,28 +72,30 @@ miette = { version = "7.2.0", features = [
] }
minijinja = { version = "1.0.20", features = ["builtins"] }
once_cell = "1.19.0"
parking_lot = "0.12.2"
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
pyproject-toml = "0.10.0"
rattler = { version = "0.24.0", default-features = false, features = [
rattler = { version = "0.24.1", default-features = false, features = [
"cli-tools",
] }
rattler_conda_types = { version = "0.22.1", default-features = false }
rattler_conda_types = { version = "0.23.0", default-features = false }
rattler_digest = { version = "0.19.3", default-features = false }
rattler_lock = { version = "0.22.5", default-features = false }
rattler_networking = { version = "0.20.5", default-features = false }
rattler_repodata_gateway = { version = "0.19.11", default-features = false, features = [
rattler_lock = { version = "=0.22.6", default-features = false }
rattler_networking = { version = "0.20.6", default-features = false }
rattler_repodata_gateway = { version = "0.20.1", default-features = false, features = [
"sparse",
"gateway"
] }
rattler_shell = { version = "0.20.2", default-features = false, features = [
"sysinfo",
] }
rattler_solve = { version = "0.21.1", default-features = false, features = [
rattler_solve = { version = "0.21.2", default-features = false, features = [
"resolvo",
] }
rattler_virtual_packages = { version = "0.19.9", default-features = false }
rattler_virtual_packages = { version = "0.19.10", default-features = false }
regex = "1.10.4"
requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
reqwest = { version = "0.12.4", default-features = false, features = ["http2", "macos-system-configuration"] }
Expand Down Expand Up @@ -166,15 +168,17 @@ toml = "0.8.12"
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.38" }
# deno_task_shell = { path = "../deno_task_shell" }
# rattler = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_digest = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_lock = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_networking = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_shell = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_solve = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }
# rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", branch = "feat/pypi_indexes" }

#rattler = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_digest = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_lock = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_networking = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_shell = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_solve = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }
#rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", branch = "feat/gateway_v3" }

#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
#rattler_digest = { path = "../rattler/crates/rattler_digest" }
#rattler_networking = { path = "../rattler/crates/rattler_networking" }
Expand Down