diff --git a/Cargo.lock b/Cargo.lock index 5b6eea604..5aa1e72cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -196,6 +196,20 @@ dependencies = [ "tempfile", ] +[[package]] +name = "astral-pubgrub" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf544aa6f110fc4bfdffcc68b1ebeb1b39ce6188e3b9e057d7a5ed4fa865e7be" +dependencies = [ + "astral-version-ranges", + "indexmap", + "log", + "priority-queue", + "rustc-hash", + "thiserror 2.0.17", +] + [[package]] name = "astral-reqwest-middleware" version = "0.4.2" @@ -254,6 +268,15 @@ dependencies = [ "xattr", ] +[[package]] +name = "astral-version-ranges" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7adc2308a566fab9de02bc0e05d18c5a21cb0e793684e4f64c8eb956969b074" +dependencies = [ + "smallvec", +] + [[package]] name = "astral_async_http_range_reader" version = "0.9.1" @@ -3190,19 +3213,6 @@ dependencies = [ "syn", ] -[[package]] -name = "pubgrub" -version = "0.3.0" -source = "git+https://github.com/astral-sh/pubgrub?rev=d8efd77673c9a90792da9da31b6c0da7ea8a324b#d8efd77673c9a90792da9da31b6c0da7ea8a324b" -dependencies = [ - "indexmap", - "log", - "priority-queue", - "rustc-hash", - "thiserror 2.0.17", - "version-ranges", -] - [[package]] name = "quick-xml" version = "0.38.3" @@ -5265,6 +5275,7 @@ dependencies = [ "arrayvec", "assert_cmd", "assert_fs", + "astral-version-ranges", "axoupdater", "backon", "base64 0.22.1", @@ -5365,7 +5376,6 @@ dependencies = [ "uv-virtualenv", "uv-warnings", "uv-workspace", - "version-ranges", "walkdir", "which", "whoami", @@ -5484,6 +5494,7 @@ dependencies = [ name = "uv-build-backend" version = "0.1.0" dependencies = [ + "astral-version-ranges", "base64 0.22.1", "csv", "flate2", @@ -5515,7 +5526,6 @@ dependencies = [ "uv-pypi-types", "uv-version", "uv-warnings", - "version-ranges", "walkdir", "zip", ] @@ -5902,6 +5912,7 @@ name = "uv-distribution-types" version = "0.0.1" dependencies = [ "arcstr", + "astral-version-ranges", "bitflags 2.9.4", "fs-err", "http", @@ -5934,7 +5945,6 @@ dependencies = [ "uv-redacted", "uv-small-str", "uv-warnings", - "version-ranges", ] [[package]] @@ -6213,6 +6223,7 @@ dependencies = [ name = "uv-pep440" version = "0.7.0" dependencies = [ + "astral-version-ranges", "indoc", "rkyv", "serde", @@ -6220,7 +6231,6 @@ dependencies = [ "unicode-width 0.2.2", "unscanny", "uv-cache-key", - "version-ranges", ] [[package]] @@ -6228,6 +6238,7 @@ name = "uv-pep508" version = "0.6.0" dependencies = [ "arcstr", + "astral-version-ranges", "boxcar", "indexmap", "insta", @@ -6249,7 +6260,6 @@ dependencies = [ "uv-normalize", "uv-pep440", "uv-redacted", - "version-ranges", ] [[package]] @@ -6517,6 +6527,7 @@ name = "uv-resolver" version = "0.0.1" dependencies = [ "arcstr", + "astral-pubgrub", "clap", "dashmap", "either", @@ -6529,7 +6540,6 @@ dependencies = [ "jiff", "owo-colors", "petgraph", - "pubgrub", "rkyv", "rustc-hash", "same-file", @@ -6842,14 +6852,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "version-ranges" -version = "0.1.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=d8efd77673c9a90792da9da31b6c0da7ea8a324b#d8efd77673c9a90792da9da31b6c0da7ea8a324b" -dependencies = [ - "smallvec", -] - [[package]] name = "version_check" version = "0.9.5" diff --git a/Cargo.toml b/Cargo.toml index 22d826014..ad971c1b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -143,7 +143,7 @@ percent-encoding = { version = "2.3.1" } petgraph = { version = "0.8.0" } proc-macro2 = { version = "1.0.86" } procfs = { version = "0.17.0", default-features = false, features = ["flate2"] } -pubgrub = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" } +pubgrub = { version = "0.3.2" , package = "astral-pubgrub" } quote = { version = "1.0.37" } rayon = { version = "1.10.0" } ref-cast = { version = "1.0.24" } @@ -193,7 +193,7 @@ unicode-width = { version = "0.2.0" } unscanny = { version = "0.1.0" } url = { version = "2.5.2", features = ["serde"] } uuid = { version = "1.16.0" } -version-ranges = { git = "https://github.com/astral-sh/pubgrub", rev = "d8efd77673c9a90792da9da31b6c0da7ea8a324b" } +version-ranges = { version = "0.1.3", package = "astral-version-ranges" } walkdir = { version = "2.5.0" } which = { version = "8.0.0", features = ["regex"] } windows = { version = "0.59.0", features = ["std", "Win32_Globalization", "Win32_System_LibraryLoader", "Win32_System_Console", "Win32_System_Kernel", "Win32_System_Diagnostics_Debug", "Win32_Storage_FileSystem", "Win32_Security", "Win32_System_Registry", "Win32_System_IO", "Win32_System_Ioctl"] }