From 010dfa5066a137eedae74b96e86f047296ac4bf3 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 20 Sep 2024 08:12:17 +0200 Subject: [PATCH] ruff: 0.6.5 -> 0.6.6 Diff: https://github.com/astral-sh/ruff/compare/refs/tags/0.6.5...0.6.6 Changelog: https://github.com/astral-sh/ruff/releases/tag/0.6.6 --- pkgs/by-name/ru/ruff/Cargo.lock | 104 ++++++++++++++++++++++++++++++- pkgs/by-name/ru/ruff/package.nix | 11 +--- 2 files changed, 103 insertions(+), 12 deletions(-) diff --git a/pkgs/by-name/ru/ruff/Cargo.lock b/pkgs/by-name/ru/ruff/Cargo.lock index 02d1a20d7cc8..64652add4bfd 100644 --- a/pkgs/by-name/ru/ruff/Cargo.lock +++ b/pkgs/by-name/ru/ruff/Cargo.lock @@ -161,6 +161,21 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_fs" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7efdb1fdb47602827a342857666feb372712cbc64b414172bd6b167a02927674" +dependencies = [ + "anstyle", + "doc-comment", + "globwalk", + "predicates", + "predicates-core", + "predicates-tree", + "tempfile", +] + [[package]] name = "autocfg" version = "1.2.0" @@ -240,6 +255,9 @@ name = "camino" version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" +dependencies = [ + "serde", +] [[package]] name = "cast" @@ -722,6 +740,12 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + [[package]] name = "digest" version = "0.10.7" @@ -773,6 +797,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "doc-comment" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" + [[package]] name = "drop_bomb" version = "0.1.5" @@ -968,6 +998,17 @@ dependencies = [ "regex-syntax 0.8.3", ] +[[package]] +name = "globwalk" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" +dependencies = [ + "bitflags 2.6.0", + "ignore", + "walkdir", +] + [[package]] name = "half" version = "2.4.1" @@ -1864,6 +1905,33 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +[[package]] +name = "predicates" +version = "3.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97" +dependencies = [ + "anstyle", + "difflib", + "predicates-core", +] + +[[package]] +name = "predicates-core" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931" + +[[package]] +name = "predicates-tree" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13" +dependencies = [ + "predicates-core", + "termtree", +] + [[package]] name = "pretty_assertions" version = "1.4.0" @@ -2187,10 +2255,11 @@ dependencies = [ [[package]] name = "ruff" -version = "0.6.5" +version = "0.6.6" dependencies = [ "anyhow", "argfile", + "assert_fs", "bincode", "bitflags 2.6.0", "cachedir", @@ -2200,7 +2269,9 @@ dependencies = [ "clearscreen", "colored", "filetime", + "globwalk", "ignore", + "indoc", "insta", "insta-cmd", "is-macro", @@ -2212,7 +2283,9 @@ dependencies = [ "rayon", "regex", "ruff_cache", + "ruff_db", "ruff_diagnostics", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_notebook", @@ -2295,6 +2368,7 @@ dependencies = [ "ruff_text_size", "rustc-hash 2.0.0", "salsa", + "serde", "tempfile", "thiserror", "tracing", @@ -2370,6 +2444,23 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "ruff_graph" +version = "0.1.0" +dependencies = [ + "anyhow", + "clap", + "red_knot_python_semantic", + "ruff_cache", + "ruff_db", + "ruff_linter", + "ruff_macros", + "ruff_python_ast", + "salsa", + "schemars", + "serde", +] + [[package]] name = "ruff_index" version = "0.0.0" @@ -2380,7 +2471,7 @@ dependencies = [ [[package]] name = "ruff_linter" -version = "0.6.5" +version = "0.6.6" dependencies = [ "aho-corasick", "annotate-snippets 0.9.2", @@ -2700,7 +2791,7 @@ dependencies = [ [[package]] name = "ruff_wasm" -version = "0.6.5" +version = "0.6.6" dependencies = [ "console_error_panic_hook", "console_log", @@ -2743,6 +2834,7 @@ dependencies = [ "regex", "ruff_cache", "ruff_formatter", + "ruff_graph", "ruff_linter", "ruff_macros", "ruff_python_ast", @@ -3197,6 +3289,12 @@ dependencies = [ "phf_codegen", ] +[[package]] +name = "termtree" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" + [[package]] name = "test-case" version = "3.3.1" diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix index 79c70c88f65c..288190ade1f0 100644 --- a/pkgs/by-name/ru/ruff/package.nix +++ b/pkgs/by-name/ru/ruff/package.nix @@ -14,13 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "astral-sh"; repo = "ruff"; rev = "refs/tags/${version}"; - hash = "sha256-1V95S0FWHzCxztgip+rbCjji4O71D+QdcSZ/hbABeKg="; + hash = "sha256-8EKOBlF6bgjgB5t3KP4AcWU7YkLaiFoAj+wuJWEOAic="; }; cargoLock = { @@ -31,13 +31,6 @@ rustPlatform.buildRustPackage rec { }; }; - # Revert the change made in https://github.com/astral-sh/ruff/pull/13299 - # It was causing linking issues: https://github.com/NixOS/nixpkgs/pull/341674#issuecomment-2351172084 - postPatch = '' - substituteInPlace crates/ruff_benchmark/Cargo.toml \ - --replace-fail '"unprefixed_malloc_on_supported_platforms"' ' ' - ''; - nativeBuildInputs = [ installShellFiles ]; buildInputs = [