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: upgrade to new uv version 0.1.32 #1208

Merged
merged 11 commits into from
Apr 18, 2024
Merged

feat: upgrade to new uv version 0.1.32 #1208

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ce58477
wip: started upgrade to new uv version
tdejager Apr 16, 2024
c32031d
wip: more uv fixes
tdejager Apr 16, 2024
cf902bd
use rattler with updated dependencies
wolfv Apr 17, 2024
8aa6409
to some degree this seems to work :)
wolfv Apr 17, 2024
9cb5c0f
clean up and use hashes more
wolfv Apr 17, 2024
3c4b0fc
add hashes to the lockfile
wolfv Apr 17, 2024
6c2d278
use rattler from main branch
wolfv Apr 17, 2024
7160d13
update snapshots
wolfv Apr 17, 2024
6059a39
use `DefaultBranch` to find if a revision was specified or not
wolfv Apr 17, 2024
12b54d6
bump: rust in pixi and sort cargo.toml
ruben-arts Apr 17, 2024
c872d75
Merge branch 'main' into feat/update-to-uv-0-1-32
tdejager Apr 18, 2024
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
822 changes: 426 additions & 396 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

110 changes: 46 additions & 64 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,19 @@ crossbeam-channel = "0.5.12"
deno_task_shell = "0.16.0"
dialoguer = "0.11.0"
dirs = "5.0.1"
distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
distribution-filename = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
distribution-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
dunce = "1.0.4"
flate2 = "1.0.28"
futures = "0.3.30"
http-cache-reqwest = "0.13.0"
http-cache-reqwest = "0.14.0"
human_bytes = "0.4.3"
humantime = "2.1.0"
ignore = "0.4.22"
indexmap = { version = "2.2.6", features = ["serde"] }
indicatif = "0.17.8"

install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
install-wheel-rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
is_executable = "1.0.1"
itertools = "0.12.1"
lazy_static = "1.4.0"
Expand All @@ -71,12 +71,12 @@ miette = { version = "7.2.0", features = [
] }
minijinja = { version = "1.0.16", features = ["builtins"] }
once_cell = "1.19.0"
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
platform-tags = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
pypi-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
pyproject-toml = "0.10.0"
rattler = { version = "0.20.0", default-features = false, features = [
rattler = { version = "0.21.0", default-features = false, features = [
"cli-tools",
] }
rattler_conda_types = { version = "0.20.4", default-features = false }
Expand All @@ -94,10 +94,10 @@ rattler_solve = { version = "0.20.4", default-features = false, features = [
] }
rattler_virtual_packages = { version = "0.19.5", default-features = false }
regex = "1.10.4"
requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
reqwest = { version = "0.11.27", default-features = false }
reqwest-middleware = "0.2.5"
reqwest-retry = "0.4.0"
requirements-txt = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
reqwest = { version = "0.12.3", default-features = false }
reqwest-middleware = "0.3.0"
reqwest-retry = "0.5.0"
self-replace = "1.3.7"
serde = "1.0.197"
serde-untagged = "0.1.5"
Expand All @@ -121,16 +121,17 @@ toml_edit = { version = "0.22.9", features = ["serde"] }
tracing = "0.1.40"
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
url = "2.5.0"
uv-build = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-traits = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
uv-build = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-cache = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-client = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-configuration = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-dispatch = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-distribution = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-installer = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-interpreter = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-normalize = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-resolver = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
uv-types = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
xxhash-rust = "0.8.10"
zip = { version = "0.6.6", default-features = false, features = [
"deflate",
Expand Down Expand Up @@ -159,26 +160,28 @@ toml = "0.8.12"
[patch.crates-io]
# For pyproject-toml
# If you change this also change the versions in the the patch section for uv
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
pep440_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.32" }
# deno_task_shell = { path = "../deno_task_shell" }
# rattler = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_conda_types = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_digest = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_lock = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_networking = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_repodata_gateway = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_shell = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_solve = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
# rattler_virtual_packages = { git = "https://github.com/baszalmstra/rattler", rev = "b6ccac0f72df9617d6d02220595ed4595aa34e1c" }
#rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
#rattler_digest = { path = "../rattler/crates/rattler_digest" }
#rattler_networking = { path = "../rattler/crates/rattler_networking" }
#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 = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_conda_types = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_digest = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_lock = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_networking = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_repodata_gateway = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_shell = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_solve = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
rattler_virtual_packages = { git = "https://github.com/wolfv/rattler", rev = "8f7b19067f5c3716f83c06d82b4620ccfb5e2766" }
# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
# rattler_digest = { path = "../rattler/crates/rattler_digest" }
# rattler_networking = { path = "../rattler/crates/rattler_networking" }
# 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 All @@ -193,31 +196,10 @@ pep508_rs = { git = "https://github.com/astral-sh/uv", tag = "0.1.24" }
# uv-interpreter = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# uv-normalize = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# uv-resolver = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# uv-traits = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# uv-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# distribution-filename = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# distribution-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# install-wheel-rs = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# platform-tags = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# pypi-types = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }
# requirements-txt = { git = "https://github.com/wolfv/uv", branch = "expose-yanks" }

# deno_task_shell = { path = "../deno_task_shell" }
# rattler = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_conda_types = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_digest = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_lock = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_networking = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_repodata_gateway = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_shell = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_solve = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }
# rattler_virtual_packages = { git = "https://github.com/mamba-org/rattler", rev = "2fb7fc1f60b250985e0674b22c5d42fd31798826" }


# rattler_conda_types = { path = "../rattler/crates/rattler_conda_types" }
# rattler_digest = { path = "../rattler/crates/rattler_digest" }
# rattler_networking = { path = "../rattler/crates/rattler_networking" }
# 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" }
Loading
Loading