Unverified Commit 77aba3a1 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #244732 from figsoda/ruff 

ruff: 0.0.278 -> 0.0.279
parents 445fae80 a318e3b1

pkgs/development/tools/ruff/Cargo.lock

+157 −21
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "6798148dccfbff0fae41c7574d2fa8f1ef3492fba0face179de5d8d447d67b05"

dependencies = [

 "memchr",

 "regex-automata",

 "regex-automata 0.3.0",

 "serde",

]
@@ -734,7 +734,7 @@ dependencies = [ 


[[package]]

name = "flake8-to-ruff"

version = "0.0.278"

version = "0.0.279"

dependencies = [

 "anyhow",

 "clap",
@@ -776,6 +776,12 @@ dependencies = [ 
 "percent-encoding",

]



[[package]]

name = "fs-err"

version = "2.9.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541"



[[package]]

name = "fsevent-sys"

version = "4.1.0"
@@ -963,6 +969,12 @@ dependencies = [ 
 "unicode-width",

]



[[package]]

name = "indoc"

version = "2.0.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "2c785eefb63ebd0e33416dfcb8d6da0bf27ce752843a45632a67bf10d4d4b5c4"



[[package]]

name = "inotify"

version = "0.9.6"
@@ -985,14 +997,15 @@ dependencies = [ 


[[package]]

name = "insta"

version = "1.30.0"

version = "1.31.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "28491f7753051e5704d4d0ae7860d45fae3238d7d235bc4289dcd45c48d3cec3"

checksum = "a0770b0a3d4c70567f0d58331f3088b0e4c4f56c9b8d764efe654b4a5d46de3a"

dependencies = [

 "console",

 "globset",

 "lazy_static",

 "linked-hash-map",

 "regex",

 "similar",

 "walkdir",

 "yaml-rust",
@@ -1192,6 +1205,15 @@ version = "0.4.19" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"



[[package]]

name = "matchers"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"

dependencies = [

 "regex-automata 0.1.10",

]



[[package]]

name = "matches"

version = "0.1.10"
@@ -1307,6 +1329,16 @@ dependencies = [ 
 "windows-sys 0.45.0",

]



[[package]]

name = "nu-ansi-term"

version = "0.46.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"

dependencies = [

 "overload",

 "winapi",

]



[[package]]

name = "num-bigint"

version = "0.4.3"
@@ -1389,6 +1421,12 @@ dependencies = [ 
 "winapi",

]



[[package]]

name = "overload"

version = "0.1.1"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"



[[package]]

name = "paste"

version = "1.0.13"
@@ -1775,8 +1813,17 @@ checksum = "89089e897c013b3deb627116ae56a6955a72b8bed395c9526af31c9fe528b484" 
dependencies = [

 "aho-corasick 1.0.2",

 "memchr",

 "regex-automata",

 "regex-syntax",

 "regex-automata 0.3.0",

 "regex-syntax 0.7.3",

]



[[package]]

name = "regex-automata"

version = "0.1.10"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"

dependencies = [

 "regex-syntax 0.6.29",

]



[[package]]
@@ -1787,9 +1834,15 @@ checksum = "fa250384981ea14565685dea16a9ccc4d1c541a13f82b9c168572264d1df8c56" 
dependencies = [

 "aho-corasick 1.0.2",

 "memchr",

 "regex-syntax",

 "regex-syntax 0.7.3",

]



[[package]]

name = "regex-syntax"

version = "0.6.29"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"



[[package]]

name = "regex-syntax"

version = "0.7.3"
@@ -1835,7 +1888,7 @@ dependencies = [ 


[[package]]

name = "ruff"

version = "0.0.278"

version = "0.0.279"

dependencies = [

 "annotate-snippets 0.9.1",

 "anyhow",
@@ -1876,7 +1929,7 @@ dependencies = [ 
 "ruff_python_ast",

 "ruff_python_semantic",

 "ruff_python_stdlib",

 "ruff_python_whitespace",

 "ruff_python_trivia",

 "ruff_rustpython",

 "ruff_text_size",

 "ruff_textwrap",
@@ -1893,12 +1946,14 @@ dependencies = [ 
 "smallvec",

 "strum",

 "strum_macros",

 "tempfile",

 "test-case",

 "thiserror",

 "toml",

 "typed-arena",

 "unicode-width",

 "unicode_names2",

 "wsl",

]



[[package]]
@@ -1933,7 +1988,7 @@ dependencies = [ 


[[package]]

name = "ruff_cli"

version = "0.0.278"

version = "0.0.279"

dependencies = [

 "annotate-snippets 0.9.1",

 "anyhow",
@@ -1950,6 +2005,7 @@ dependencies = [ 
 "filetime",

 "glob",

 "ignore",

 "insta",

 "itertools",

 "itoa",

 "log",
@@ -1972,6 +2028,7 @@ dependencies = [ 
 "shellexpand",

 "similar",

 "strum",

 "tempfile",

 "tikv-jemallocator",

 "ureq",

 "walkdir",
@@ -1986,6 +2043,7 @@ dependencies = [ 
 "clap",

 "ignore",

 "indicatif",

 "indoc",

 "itertools",

 "libcst",

 "log",
@@ -2003,11 +2061,13 @@ dependencies = [ 
 "rustpython-format",

 "rustpython-parser",

 "schemars",

 "serde",

 "serde_json",

 "similar",

 "strum",

 "strum_macros",

 "tempfile",

 "toml",

]



[[package]]
@@ -2068,7 +2128,7 @@ dependencies = [ 
 "num-bigint",

 "num-traits",

 "once_cell",

 "ruff_python_whitespace",

 "ruff_python_trivia",

 "ruff_text_size",

 "rustc-hash",

 "rustpython-ast",
@@ -2092,7 +2152,7 @@ dependencies = [ 
 "once_cell",

 "ruff_formatter",

 "ruff_python_ast",

 "ruff_python_whitespace",

 "ruff_python_trivia",

 "ruff_text_size",

 "rustc-hash",

 "rustpython-parser",
@@ -2101,7 +2161,6 @@ dependencies = [ 
 "similar",

 "smallvec",

 "thiserror",

 "unic-ucd-ident",

]



[[package]]
@@ -2136,11 +2195,14 @@ name = "ruff_python_stdlib" 
version = "0.0.0"



[[package]]

name = "ruff_python_whitespace"

name = "ruff_python_trivia"

version = "0.0.0"

dependencies = [

 "insta",

 "memchr",

 "ruff_text_size",

 "smallvec",

 "unic-ucd-ident",

]



[[package]]
@@ -2151,10 +2213,26 @@ dependencies = [ 
 "rustpython-parser",

]



[[package]]

name = "ruff_shrinking"

version = "0.1.0"

dependencies = [

 "anyhow",

 "clap",

 "fs-err",

 "regex",

 "ruff_python_ast",

 "ruff_rustpython",

 "rustpython-ast",

 "shlex",

 "tracing",

 "tracing-subscriber",

]



[[package]]

name = "ruff_text_size"

version = "0.0.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "schemars",

 "serde",
@@ -2164,7 +2242,7 @@ dependencies = [ 
name = "ruff_textwrap"

version = "0.0.0"

dependencies = [

 "ruff_python_whitespace",

 "ruff_python_trivia",

 "ruff_text_size",

]
@@ -2179,6 +2257,7 @@ dependencies = [ 
 "ruff",

 "ruff_diagnostics",

 "ruff_python_ast",

 "ruff_python_formatter",

 "ruff_rustpython",

 "rustpython-parser",

 "serde",
@@ -2255,7 +2334,7 @@ dependencies = [ 
[[package]]

name = "rustpython-ast"

version = "0.2.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "is-macro",

 "num-bigint",
@@ -2266,7 +2345,7 @@ dependencies = [ 
[[package]]

name = "rustpython-format"

version = "0.2.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "bitflags 2.3.3",

 "itertools",
@@ -2278,7 +2357,7 @@ dependencies = [ 
[[package]]

name = "rustpython-literal"

version = "0.2.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "hexf-parse",

 "is-macro",
@@ -2290,7 +2369,7 @@ dependencies = [ 
[[package]]

name = "rustpython-parser"

version = "0.2.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "anyhow",

 "is-macro",
@@ -2313,7 +2392,7 @@ dependencies = [ 
[[package]]

name = "rustpython-parser-core"

version = "0.2.0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=c174bbf1f29527edd43d432326327f16f47ab9e0#c174bbf1f29527edd43d432326327f16f47ab9e0"

source = "git+https://github.com/astral-sh/RustPython-Parser.git?rev=4d03b9b5b212fc869e4cfda151414438186a7779#4d03b9b5b212fc869e4cfda151414438186a7779"

dependencies = [

 "is-macro",

 "memchr",
@@ -2483,6 +2562,15 @@ dependencies = [ 
 "syn 2.0.23",

]



[[package]]

name = "sharded-slab"

version = "0.1.4"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"

dependencies = [

 "lazy_static",

]



[[package]]

name = "shellexpand"

version = "3.1.0"
@@ -2492,6 +2580,12 @@ dependencies = [ 
 "dirs 5.0.1",

]



[[package]]

name = "shlex"

version = "1.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"



[[package]]

name = "similar"

version = "2.2.1"
@@ -2845,6 +2939,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" 
checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"

dependencies = [

 "once_cell",

 "valuable",

]



[[package]]

name = "tracing-log"

version = "0.1.3"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"

dependencies = [

 "lazy_static",

 "log",

 "tracing-core",

]



[[package]]

name = "tracing-subscriber"

version = "0.3.17"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"

dependencies = [

 "matchers",

 "nu-ansi-term",

 "once_cell",

 "regex",

 "sharded-slab",

 "smallvec",

 "thread_local",

 "tracing",

 "tracing-core",

 "tracing-log",

]



[[package]]
@@ -2998,6 +3122,12 @@ version = "1.4.0" 
source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "d023da39d1fde5a8a3fe1f3e01ca9632ada0a63e9797de55a879d6e2236277be"



[[package]]

name = "valuable"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"



[[package]]

name = "version_check"

version = "0.9.4"
@@ -3345,6 +3475,12 @@ dependencies = [ 
 "memchr",

]



[[package]]

name = "wsl"

version = "0.1.0"

source = "registry+https://github.com/rust-lang/crates.io-index"

checksum = "f8dab7ac864710bdea6594becbea5b5050333cf34fefb0dc319567eb347950d4"



[[package]]

name = "yaml-rust"

version = "0.4.5"

pkgs/development/tools/ruff/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -10,20 +10,20 @@ 


rustPlatform.buildRustPackage rec {

  pname = "ruff";

  version = "0.0.278";

  version = "0.0.279";



  src = fetchFromGitHub {

    owner = "astral-sh";

    repo = pname;

    rev = "v${version}";

    hash = "sha256-CM5oV9q9XYhaUV173VoFZl6dDALan4Lkl5PrvZN81c4=";

    hash = "sha256-7f/caaCbYt+Uatd12gATSJgs5Nx/X7YZhXEESl5OtWE=";

  };



  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "libcst-0.1.0" = "sha256-FgQE8ofRXQs/zHh7AKscXu0deN3IG+Nk/h+a09Co5R8=";

      "ruff_text_size-0.0.0" = "sha256-N4IzMeU8vqkfPBbC3o2bqkecCUcbgmX35QVdsTCtFfc=";

      "ruff_text_size-0.0.0" = "sha256-5BAsTsgvrP+77yZuA/QfEwVOmCj82ab8Y4D3NtY7E2Q=";

      "unicode_names2-0.6.0" = "sha256-eWg9+ISm/vztB0KIdjhq5il2ZnwGJQCleCYfznCI3Wg=";

    };

  };
@@ -45,6 +45,11 @@ rustPlatform.buildRustPackage rec { 
    export JEMALLOC_SYS_WITH_LG_VADDR=48

  '';



  # tests expect no colors

  preCheck = ''

    export NO_COLOR=1

  '';



  postInstall = ''

    installShellCompletion --cmd ruff \

      --bash <($out/bin/ruff generate-shell-completion bash) \