Python
/
uv
mirror of https://github.com/astral-sh/uv
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use crates.io reqwest-middleware fork (#16738) 

Requires forking async_http_range_reader too and a new ambient-id
release.
This commit is contained in:
konsti 2025-11-14 18:43:25 +01:00 committed by GitHub
parent 1a14d595fd
commit 181262bdbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 76 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
Cargo.lock generated
View File

@ -45,12 +45,12 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
[[package]] [[package]]
name = "ambient-id" name = "ambient-id"
version = "0.0.5" version = "0.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a55e62faa820045efacb144fd9bcb16e62a5960ffc4bc270aaff7b78f0fcdcaa" checksum = "36b48a3b1ad866e5034859be45edd1ebba2f097289c8a34b61623c76f10480f3"
dependencies = [ dependencies = [
"astral-reqwest-middleware",
"reqwest", "reqwest",
"reqwest-middleware",
"secrecy", "secrecy",
"serde", "serde",
"serde_json", "serde_json",
@ -196,6 +196,42 @@ dependencies = [
"tempfile", "tempfile",
] ]
[[package]]
name = "astral-reqwest-middleware"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "638d02e24aeb92f9537897cd1ff82e2bc98fd9ac9575a503e27bb07cdf64d4d7"
dependencies = [
"anyhow",
"async-trait",
"http",
"reqwest",
"serde",
"thiserror 2.0.17",
"tower-service",
]
[[package]]
name = "astral-reqwest-retry"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb7549bd00f62f73f2e7e76f3f77ccdabb31873f4f02f758ed88ad739d522867"
dependencies = [
"anyhow",
"astral-reqwest-middleware",
"async-trait",
"futures",
"getrandom 0.2.16",
"http",
"hyper",
"reqwest",
"retry-policies",
"thiserror 2.0.17",
"tokio",
"tracing",
"wasmtimer",
]
[[package]] [[package]]
name = "astral-tl" name = "astral-tl"
version = "0.7.9" version = "0.7.9"
@ -218,6 +254,26 @@ dependencies = [
"xattr", "xattr",
] ]
[[package]]
name = "astral_async_http_range_reader"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ddaca0fbbf0d91103cca7c7611790c65f6eff1d456f7fe6bf565d436dc9b8f3"
dependencies = [
"astral-reqwest-middleware",
"bisection",
"futures",
"http-content-range",
"itertools 0.13.0",
"memmap2 0.9.7",
"reqwest",
"thiserror 1.0.69",
"tokio",
"tokio-stream",
"tokio-util",
"tracing",
]
[[package]] [[package]]
name = "async-broadcast" name = "async-broadcast"
version = "0.7.2" version = "0.7.2"
@ -282,26 +338,6 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "async_http_range_reader"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b537c00269e3f943e06f5d7cabf8ccd281b800fd0c7f111dd82f77154334197"
dependencies = [
"bisection",
"futures",
"http-content-range",
"itertools 0.13.0",
"memmap2 0.9.7",
"reqwest",
"reqwest-middleware",
"thiserror 1.0.69",
"tokio",
"tokio-stream",
"tokio-util",
"tracing",
]
[[package]] [[package]]
name = "async_zip" name = "async_zip"
version = "0.0.17" version = "0.0.17"
@ -3591,40 +3627,6 @@ dependencies = [
"webpki-roots", "webpki-roots",
] ]
[[package]]
name = "reqwest-middleware"
version = "0.4.2"
source = "git+https://github.com/astral-sh/reqwest-middleware?rev=7650ed76215a962a96d94a79be71c27bffde7ab2#7650ed76215a962a96d94a79be71c27bffde7ab2"
dependencies = [
"anyhow",
"async-trait",
"http",
"reqwest",
"serde",
"thiserror 2.0.17",
"tower-service",
]
[[package]]
name = "reqwest-retry"
version = "0.7.0"
source = "git+https://github.com/astral-sh/reqwest-middleware?rev=7650ed76215a962a96d94a79be71c27bffde7ab2#7650ed76215a962a96d94a79be71c27bffde7ab2"
dependencies = [
"anyhow",
"async-trait",
"futures",
"getrandom 0.2.16",
"http",
"hyper",
"reqwest",
"reqwest-middleware",
"retry-policies",
"thiserror 2.0.17",
"tokio",
"tracing",
"wasmtimer",
]
[[package]] [[package]]
name = "resvg" name = "resvg"
version = "0.29.0" version = "0.29.0"
@ -5378,6 +5380,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"arcstr", "arcstr",
"astral-reqwest-middleware",
"async-trait", "async-trait",
"base64 0.22.1", "base64 0.22.1",
"etcetera", "etcetera",
@ -5389,7 +5392,6 @@ dependencies = [
"percent-encoding", "percent-encoding",
"reqsign", "reqsign",
"reqwest", "reqwest",
"reqwest-middleware",
"rust-netrc", "rust-netrc",
"rustc-hash", "rustc-hash",
"schemars", "schemars",
@ -5446,11 +5448,11 @@ dependencies = [
name = "uv-bin-install" name = "uv-bin-install"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"astral-reqwest-middleware",
"astral-reqwest-retry",
"fs-err", "fs-err",
"futures", "futures",
"reqwest", "reqwest",
"reqwest-middleware",
"reqwest-retry",
"tempfile", "tempfile",
"thiserror 2.0.17", "thiserror 2.0.17",
"tokio", "tokio",
@ -5646,9 +5648,11 @@ name = "uv-client"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"astral-reqwest-middleware",
"astral-reqwest-retry",
"astral-tl", "astral-tl",
"astral_async_http_range_reader",
"async-trait", "async-trait",
"async_http_range_reader",
"async_zip", "async_zip",
"bytecheck", "bytecheck",
"fs-err", "fs-err",
@ -5664,8 +5668,6 @@ dependencies = [
"jiff", "jiff",
"percent-encoding", "percent-encoding",
"reqwest", "reqwest",
"reqwest-middleware",
"reqwest-retry",
"rkyv", "rkyv",
"rmp-serde", "rmp-serde",
"rustc-hash", "rustc-hash",
@ -5835,6 +5837,7 @@ name = "uv-distribution"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"astral-reqwest-middleware",
"either", "either",
"fs-err", "fs-err",
"futures", "futures",
@ -5843,7 +5846,6 @@ dependencies = [
"nanoid", "nanoid",
"owo-colors", "owo-colors",
"reqwest", "reqwest",
"reqwest-middleware",
"rmp-serde", "rmp-serde",
"rustc-hash", "rustc-hash",
"serde", "serde",
@ -5999,11 +6001,11 @@ name = "uv-git"
version = "0.0.1" version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"astral-reqwest-middleware",
"cargo-util", "cargo-util",
"dashmap", "dashmap",
"fs-err", "fs-err",
"reqwest", "reqwest",
"reqwest-middleware",
"thiserror 2.0.17", "thiserror 2.0.17",
"tokio", "tokio",
"tracing", "tracing",
@ -6302,6 +6304,8 @@ name = "uv-publish"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ambient-id", "ambient-id",
"astral-reqwest-middleware",
"astral-reqwest-retry",
"astral-tokio-tar", "astral-tokio-tar",
"async-compression", "async-compression",
"base64 0.22.1", "base64 0.22.1",
@ -6311,8 +6315,6 @@ dependencies = [
"insta", "insta",
"itertools 0.14.0", "itertools 0.14.0",
"reqwest", "reqwest",
"reqwest-middleware",
"reqwest-retry",
"rustc-hash", "rustc-hash",
"serde", "serde",
"serde_json", "serde_json",
@ -6374,6 +6376,8 @@ version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_fs", "assert_fs",
"astral-reqwest-middleware",
"astral-reqwest-retry",
"clap", "clap",
"configparser", "configparser",
"dunce", "dunce",
@ -6388,8 +6392,6 @@ dependencies = [
"ref-cast", "ref-cast",
"regex", "regex",
"reqwest", "reqwest",
"reqwest-middleware",
"reqwest-retry",
"rmp-serde", "rmp-serde",
"rustc-hash", "rustc-hash",
"same-file", "same-file",
@ -6483,6 +6485,7 @@ version = "0.0.1"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_fs", "assert_fs",
"astral-reqwest-middleware",
"fs-err", "fs-err",
"indoc", "indoc",
"insta", "insta",
@ -6490,7 +6493,6 @@ dependencies = [
"memchr", "memchr",
"regex", "regex",
"reqwest", "reqwest",
"reqwest-middleware",
"rustc-hash", "rustc-hash",
"tempfile", "tempfile",
"test-case", "test-case",

12
Cargo.toml
View File

@ -78,7 +78,7 @@ uv-virtualenv = { path = "crates/uv-virtualenv" }
uv-warnings = { path = "crates/uv-warnings" } uv-warnings = { path = "crates/uv-warnings" }
uv-workspace = { path = "crates/uv-workspace" } uv-workspace = { path = "crates/uv-workspace" }
ambient-id = { version = "0.0.5" } ambient-id = { version = "0.0.6", default-features = false, features = ["astral-reqwest-middleware"] }
anstream = { version = "0.6.15" } anstream = { version = "0.6.15" }
anyhow = { version = "1.0.89" } anyhow = { version = "1.0.89" }
arcstr = { version = "1.2.0" } arcstr = { version = "1.2.0" }
@ -87,7 +87,7 @@ astral-tokio-tar = { version = "0.5.6" }
async-channel = { version = "2.3.1" } async-channel = { version = "2.3.1" }
async-compression = { version = "0.4.12", features = ["bzip2", "gzip", "xz", "zstd"] } async-compression = { version = "0.4.12", features = ["bzip2", "gzip", "xz", "zstd"] }
async-trait = { version = "0.1.82" } async-trait = { version = "0.1.82" }
async_http_range_reader = { version = "0.9.1" } async_http_range_reader = { version = "0.9.1", package = "astral_async_http_range_reader" }
async_zip = { git = "https://github.com/astral-sh/rs-async-zip", rev = "f6a41d32866003c868d03ed791a89c794f61b703", features = ["bzip2", "deflate", "lzma", "tokio", "xz", "zstd"] } async_zip = { git = "https://github.com/astral-sh/rs-async-zip", rev = "f6a41d32866003c868d03ed791a89c794f61b703", features = ["bzip2", "deflate", "lzma", "tokio", "xz", "zstd"] }
axoupdater = { version = "0.9.0", default-features = false } axoupdater = { version = "0.9.0", default-features = false }
backon = { version = "1.3.0" } backon = { version = "1.3.0" }
@ -152,8 +152,8 @@ regex = { version = "1.10.6" }
regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-build", "dfa-search", "perf", "std", "syntax"] } regex-automata = { version = "0.4.8", default-features = false, features = ["dfa-build", "dfa-search", "perf", "std", "syntax"] }
reqsign = { version = "0.18.0", features = ["aws", "default-context"], default-features = false } reqsign = { version = "0.18.0", features = ["aws", "default-context"], default-features = false }
reqwest = { version = "0.12.22", default-features = false, features = ["json", "gzip", "deflate", "zstd", "stream", "system-proxy", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] } reqwest = { version = "0.12.22", default-features = false, features = ["json", "gzip", "deflate", "zstd", "stream", "system-proxy", "rustls-tls", "rustls-tls-native-roots", "socks", "multipart", "http2", "blocking"] }
reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2", features = ["multipart"] } reqwest-middleware = { version = "0.4.2", package = "astral-reqwest-middleware", features = ["multipart"] }
reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" } reqwest-retry = { version = "0.7.0", package = "astral-reqwest-retry" }
rkyv = { version = "0.8.8", features = ["bytecheck"] } rkyv = { version = "0.8.8", features = ["bytecheck"] }
rmp-serde = { version = "1.3.0" } rmp-serde = { version = "1.3.0" }
rust-netrc = { version = "0.1.2" } rust-netrc = { version = "0.1.2" }
@ -328,7 +328,3 @@ codegen-units = 1
# The profile that 'cargo dist' will build with. # The profile that 'cargo dist' will build with.
[profile.dist] [profile.dist]
inherits = "release" inherits = "release"
[patch.crates-io]
reqwest-middleware = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }
reqwest-retry = { git = "https://github.com/astral-sh/reqwest-middleware", rev = "7650ed76215a962a96d94a79be71c27bffde7ab2" }