diff --git a/pkgs/by-name/uv/uv/Cargo.lock b/pkgs/by-name/uv/uv/Cargo.lock index 28a28b4206d4..81507fd74255 100644 --- a/pkgs/by-name/uv/uv/Cargo.lock +++ b/pkgs/by-name/uv/uv/Cargo.lock @@ -2475,6 +2475,30 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "procfs" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" +dependencies = [ + "bitflags 2.6.0", + "flate2", + "hex", + "lazy_static", + "procfs-core", + "rustix", +] + +[[package]] +name = "procfs-core" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" +dependencies = [ + "bitflags 2.6.0", + "hex", +] + [[package]] name = "ptr_meta" version = "0.3.0" @@ -2498,13 +2522,14 @@ dependencies = [ [[package]] name = "pubgrub" version = "0.2.1" -source = "git+https://github.com/astral-sh/pubgrub?rev=7243f4faf8e54837aa8a401a18406e7173de4ad5#7243f4faf8e54837aa8a401a18406e7173de4ad5" +source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79" dependencies = [ "indexmap", "log", "priority-queue", "rustc-hash", "thiserror", + "version-ranges", ] [[package]] @@ -2784,7 +2809,7 @@ dependencies = [ "wasm-streams", "web-sys", "webpki-roots", - "windows-registry", + "windows-registry 0.2.0", ] [[package]] @@ -3607,15 +3632,6 @@ dependencies = [ "syn", ] -[[package]] -name = "testing_logger" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d92b727cb45d33ae956f7f46b966b25f1bc712092aeef9dba5ac798fc89f720" -dependencies = [ - "log", -] - [[package]] name = "textwrap" version = "0.16.1" @@ -3942,6 +3958,27 @@ dependencies = [ "tracing-serde", ] +[[package]] +name = "tracing-test" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "557b891436fe0d5e0e363427fc7f217abf9ccd510d5136549847bdcbcd011d68" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracing-test-macro", +] + +[[package]] +name = "tracing-test-macro" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04659ddb06c87d233c566112c1c9c5b9e98256d9af50ec3bc9c8327f873a7568" +dependencies = [ + "quote", + "syn", +] + [[package]] name = "tracing-tree" version = "0.4.0" @@ -4139,7 +4176,7 @@ checksum = "f8c5f0a0af699448548ad1a2fbf920fb4bee257eae39953ba95cb84891a0446a" [[package]] name = "uv" -version = "0.4.28" +version = "0.4.29" dependencies = [ "anstream", "anyhow", @@ -4158,7 +4195,6 @@ dependencies = [ "futures", "http", "ignore", - "indexmap", "indicatif", "indoc", "insta", @@ -4166,11 +4202,13 @@ dependencies = [ "jiff", "miette", "owo-colors", + "petgraph", "predicates", "rayon", "regex", "reqwest", "rustc-hash", + "same-file", "serde", "serde_json", "similar", @@ -4302,9 +4340,9 @@ dependencies = [ "uv-normalize", "uv-pep440", "uv-pep508", - "uv-pubgrub", "uv-pypi-types", "uv-warnings", + "version-ranges", "walkdir", "zip", ] @@ -4770,6 +4808,7 @@ dependencies = [ "uv-pep440", "uv-platform-tags", "uv-pypi-types", + "uv-trampoline-builder", "uv-warnings", "walkdir", "zip", @@ -4873,6 +4912,7 @@ dependencies = [ "tracing", "unicode-width", "unscanny", + "version-ranges", ] [[package]] @@ -4883,23 +4923,21 @@ dependencies = [ "indexmap", "insta", "itertools 0.13.0", - "log", - "pubgrub", "regex", "rustc-hash", "schemars", "serde", "serde_json", "smallvec", - "testing_logger", "thiserror", "tracing", + "tracing-test", "unicode-width", "url", "uv-fs", "uv-normalize", "uv-pep440", - "uv-pubgrub", + "version-ranges", ] [[package]] @@ -4927,16 +4965,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "uv-pubgrub" -version = "0.0.1" -dependencies = [ - "itertools 0.13.0", - "pubgrub", - "thiserror", - "uv-pep440", -] - [[package]] name = "uv-publish" version = "0.1.0" @@ -5011,6 +5039,7 @@ dependencies = [ "indoc", "itertools 0.13.0", "owo-colors", + "procfs", "regex", "reqwest", "reqwest-middleware", @@ -5032,6 +5061,7 @@ dependencies = [ "uv-cache-info", "uv-cache-key", "uv-client", + "uv-dirs", "uv-distribution-filename", "uv-extract", "uv-fs", @@ -5044,7 +5074,7 @@ dependencies = [ "uv-static", "uv-warnings", "which", - "windows-registry", + "windows-registry 0.3.0", "windows-result 0.2.0", "windows-sys 0.59.0", ] @@ -5156,7 +5186,6 @@ dependencies = [ "uv-pep440", "uv-pep508", "uv-platform-tags", - "uv-pubgrub", "uv-pypi-types", "uv-python", "uv-requirements-txt", @@ -5268,6 +5297,20 @@ dependencies = [ "uv-virtualenv", ] +[[package]] +name = "uv-trampoline-builder" +version = "0.0.1" +dependencies = [ + "anyhow", + "assert_cmd", + "assert_fs", + "fs-err", + "thiserror", + "uv-fs", + "which", + "zip", +] + [[package]] name = "uv-types" version = "0.0.1" @@ -5290,7 +5333,7 @@ dependencies = [ [[package]] name = "uv-version" -version = "0.4.28" +version = "0.4.29" [[package]] name = "uv-virtualenv" @@ -5361,6 +5404,14 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" +[[package]] +name = "version-ranges" +version = "0.1.0" +source = "git+https://github.com/astral-sh/pubgrub?rev=95e1390399cdddee986b658be19587eb1fdb2d79#95e1390399cdddee986b658be19587eb1fdb2d79" +dependencies = [ + "smallvec", +] + [[package]] name = "version_check" version = "0.9.5" @@ -5612,7 +5663,7 @@ dependencies = [ "windows-implement 0.58.0", "windows-interface 0.58.0", "windows-result 0.2.0", - "windows-strings", + "windows-strings 0.1.0", "windows-targets 0.52.6", ] @@ -5667,7 +5718,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0" dependencies = [ "windows-result 0.2.0", - "windows-strings", + "windows-strings 0.1.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-registry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a" +dependencies = [ + "windows-result 0.2.0", + "windows-strings 0.2.0", "windows-targets 0.52.6", ] @@ -5699,6 +5761,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-strings" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix index c2b4691e9c20..ef4814207cab 100644 --- a/pkgs/by-name/uv/uv/package.nix +++ b/pkgs/by-name/uv/uv/package.nix @@ -15,21 +15,21 @@ python3Packages.buildPythonApplication rec { pname = "uv"; - version = "0.4.28"; + version = "0.4.29"; pyproject = true; src = fetchFromGitHub { owner = "astral-sh"; repo = "uv"; rev = "refs/tags/${version}"; - hash = "sha256-QoEgwMhoqabwbtjOVOW+hgOUuDVZQQ5x+cF6kdWgFvc="; + hash = "sha256-FJJnb4m9yPf1bBvlAyAgQKgAzt4O0tbokYkz4iY6kbg="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "async_zip-0.0.17" = "sha256-3k9rc4yHWhqsCUJ17K55F8aQoCKdVamrWAn6IDWo3Ss="; - "pubgrub-0.2.1" = "sha256-mSpRBdQJWtKKD1zHkV7vuyfKTDY6Ejgjll5q5ryCfmY="; + "pubgrub-0.2.1" = "sha256-8TrOQ6fYJrYgFNuqiqnGztnHOqFIEDi2MFZEBA+oks4="; "reqwest-middleware-0.3.3" = "sha256-KjyXB65a7SAfwmxokH2PQFFcJc6io0xuIBQ/yZELJzM="; "tl-0.7.8" = "sha256-F06zVeSZA4adT6AzLzz1i9uxpI1b8P1h+05fFfjm3GQ="; };