diff --git a/MODULE.bazel b/MODULE.bazel index a19753b161d..427f450e7fc 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -60,9 +60,9 @@ use_repo( py_deps, "vendor_py__anyhow-1.0.95", "vendor_py__cc-1.2.14", - "vendor_py__clap-4.5.29", + "vendor_py__clap-4.5.30", "vendor_py__regex-1.11.1", - "vendor_py__tree-sitter-0.20.10", + "vendor_py__tree-sitter-0.20.4", "vendor_py__tree-sitter-graph-0.7.0", ) diff --git a/misc/bazel/3rdparty/py_deps/BUILD.bazel b/misc/bazel/3rdparty/py_deps/BUILD.bazel index 4ed674c7b57..541a99c9d74 100644 --- a/misc/bazel/3rdparty/py_deps/BUILD.bazel +++ b/misc/bazel/3rdparty/py_deps/BUILD.bazel @@ -44,14 +44,14 @@ alias( ) alias( - name = "clap-4.5.29", - actual = "@vendor_py__clap-4.5.29//:clap", + name = "clap-4.5.30", + actual = "@vendor_py__clap-4.5.30//:clap", tags = ["manual"], ) alias( name = "clap", - actual = "@vendor_py__clap-4.5.29//:clap", + actual = "@vendor_py__clap-4.5.30//:clap", tags = ["manual"], ) @@ -68,14 +68,14 @@ alias( ) alias( - name = "tree-sitter-0.20.10", - actual = "@vendor_py__tree-sitter-0.20.10//:tree_sitter", + name = "tree-sitter-0.20.4", + actual = "@vendor_py__tree-sitter-0.20.4//:tree_sitter", tags = ["manual"], ) alias( name = "tree-sitter", - actual = "@vendor_py__tree-sitter-0.20.10//:tree_sitter", + actual = "@vendor_py__tree-sitter-0.20.4//:tree_sitter", tags = ["manual"], ) diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.29.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel similarity index 97% rename from misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.29.bazel rename to misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel index 69978ee20f6..bab01231626 100644 --- a/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.29.bazel +++ b/misc/bazel/3rdparty/py_deps/BUILD.clap-4.5.30.bazel @@ -88,8 +88,8 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "4.5.29", + version = "4.5.30", deps = [ - "@vendor_py__clap_builder-4.5.29//:clap_builder", + "@vendor_py__clap_builder-4.5.30//:clap_builder", ], ) diff --git a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.29.bazel b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel similarity index 99% rename from misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.29.bazel rename to misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel index c9462e52d9a..eb6a5e244c5 100644 --- a/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.29.bazel +++ b/misc/bazel/3rdparty/py_deps/BUILD.clap_builder-4.5.30.bazel @@ -87,7 +87,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "4.5.29", + version = "4.5.30", deps = [ "@vendor_py__anstream-0.6.18//:anstream", "@vendor_py__anstyle-1.0.10//:anstyle", diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.10.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel similarity index 96% rename from misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.10.bazel rename to misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel index 47f0492dcb3..3b5db51f105 100644 --- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.10.bazel +++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-0.20.4.bazel @@ -30,7 +30,7 @@ rust_library( ], ), crate_root = "binding_rust/lib.rs", - edition = "2021", + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], @@ -80,10 +80,10 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.20.10", + version = "0.20.4", deps = [ "@vendor_py__regex-1.11.1//:regex", - "@vendor_py__tree-sitter-0.20.10//:build_script_build", + "@vendor_py__tree-sitter-0.20.4//:build_script_build", ], ) @@ -120,7 +120,7 @@ cargo_build_script( "WORKSPACE.bazel", ], ), - edition = "2021", + edition = "2018", pkg_name = "tree-sitter", rustc_flags = [ "--cap-lints=allow", @@ -132,7 +132,7 @@ cargo_build_script( "noclippy", "norustfmt", ], - version = "0.20.10", + version = "0.20.4", visibility = ["//visibility:private"], deps = [ "@vendor_py__cc-1.2.14//:cc", diff --git a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel index ef47a5a3d81..adb4680650d 100644 --- a/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel +++ b/misc/bazel/3rdparty/py_deps/BUILD.tree-sitter-graph-0.7.0.bazel @@ -88,6 +88,6 @@ rust_library( "@vendor_py__smallvec-1.14.0//:smallvec", "@vendor_py__string-interner-0.12.2//:string_interner", "@vendor_py__thiserror-1.0.69//:thiserror", - "@vendor_py__tree-sitter-0.20.10//:tree_sitter", + "@vendor_py__tree-sitter-0.20.4//:tree_sitter", ], ) diff --git a/misc/bazel/3rdparty/py_deps/defs.bzl b/misc/bazel/3rdparty/py_deps/defs.bzl index e630e1f713d..9d78e46b2f8 100644 --- a/misc/bazel/3rdparty/py_deps/defs.bzl +++ b/misc/bazel/3rdparty/py_deps/defs.bzl @@ -296,15 +296,15 @@ _NORMAL_DEPENDENCIES = { "python/extractor/tsg-python": { _COMMON_CONDITION: { "anyhow": Label("@vendor_py__anyhow-1.0.95//:anyhow"), - "clap": Label("@vendor_py__clap-4.5.29//:clap"), + "clap": Label("@vendor_py__clap-4.5.30//:clap"), "regex": Label("@vendor_py__regex-1.11.1//:regex"), - "tree-sitter": Label("@vendor_py__tree-sitter-0.20.10//:tree_sitter"), + "tree-sitter": Label("@vendor_py__tree-sitter-0.20.4//:tree_sitter"), "tree-sitter-graph": Label("@vendor_py__tree-sitter-graph-0.7.0//:tree_sitter_graph"), }, }, "python/extractor/tsg-python/tsp": { _COMMON_CONDITION: { - "tree-sitter": Label("@vendor_py__tree-sitter-0.20.10//:tree_sitter"), + "tree-sitter": Label("@vendor_py__tree-sitter-0.20.4//:tree_sitter"), }, }, } @@ -554,22 +554,22 @@ def crate_repositories(): maybe( http_archive, - name = "vendor_py__clap-4.5.29", - sha256 = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184", + name = "vendor_py__clap-4.5.30", + sha256 = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d", type = "tar.gz", - urls = ["https://static.crates.io/crates/clap/4.5.29/download"], - strip_prefix = "clap-4.5.29", - build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.29.bazel"), + urls = ["https://static.crates.io/crates/clap/4.5.30/download"], + strip_prefix = "clap-4.5.30", + build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.30.bazel"), ) maybe( http_archive, - name = "vendor_py__clap_builder-4.5.29", - sha256 = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9", + name = "vendor_py__clap_builder-4.5.30", + sha256 = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c", type = "tar.gz", - urls = ["https://static.crates.io/crates/clap_builder/4.5.29/download"], - strip_prefix = "clap_builder-4.5.29", - build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.29.bazel"), + urls = ["https://static.crates.io/crates/clap_builder/4.5.30/download"], + strip_prefix = "clap_builder-4.5.30", + build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.30.bazel"), ) maybe( @@ -814,12 +814,12 @@ def crate_repositories(): maybe( http_archive, - name = "vendor_py__tree-sitter-0.20.10", - sha256 = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d", + name = "vendor_py__tree-sitter-0.20.4", + sha256 = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a", type = "tar.gz", - urls = ["https://static.crates.io/crates/tree-sitter/0.20.10/download"], - strip_prefix = "tree-sitter-0.20.10", - build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.10.bazel"), + urls = ["https://static.crates.io/crates/tree-sitter/0.20.4/download"], + strip_prefix = "tree-sitter-0.20.4", + build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.4.bazel"), ) maybe( @@ -955,8 +955,8 @@ def crate_repositories(): return [ struct(repo = "vendor_py__anyhow-1.0.95", is_dev_dep = False), struct(repo = "vendor_py__cc-1.2.14", is_dev_dep = False), - struct(repo = "vendor_py__clap-4.5.29", is_dev_dep = False), + struct(repo = "vendor_py__clap-4.5.30", is_dev_dep = False), struct(repo = "vendor_py__regex-1.11.1", is_dev_dep = False), - struct(repo = "vendor_py__tree-sitter-0.20.10", is_dev_dep = False), + struct(repo = "vendor_py__tree-sitter-0.20.4", is_dev_dep = False), struct(repo = "vendor_py__tree-sitter-graph-0.7.0", is_dev_dep = False), ] diff --git a/python/extractor/tsg-python/Cargo.lock b/python/extractor/tsg-python/Cargo.lock index 10a0603a715..16849dc7f4d 100644 --- a/python/extractor/tsg-python/Cargo.lock +++ b/python/extractor/tsg-python/Cargo.lock @@ -90,18 +90,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.29" +version = "4.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" +checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.29" +version = "4.5.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" +checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c" dependencies = [ "anstream", "anstyle", @@ -306,9 +306,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.20.10" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" +checksum = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a" dependencies = [ "cc", "regex", diff --git a/python/extractor/tsg-python/Cargo.toml b/python/extractor/tsg-python/Cargo.toml index e5f889f0dfb..259d2a7d353 100644 --- a/python/extractor/tsg-python/Cargo.toml +++ b/python/extractor/tsg-python/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" [dependencies] anyhow = "1.0" regex = "1" -tree-sitter = "0.20.4" +tree-sitter = "=0.20.4" tree-sitter-graph = "0.7.0" tsp = {path = "tsp"} clap = "4.5"