Python: downgrade tree-sitter back to 0.20.4

This commit is contained in:
Paolo Tranquilli
2025-02-18 10:03:18 +01:00
parent 342bff6125
commit 38efd4a8a2
9 changed files with 44 additions and 44 deletions

View File

@@ -60,9 +60,9 @@ use_repo(
py_deps, py_deps,
"vendor_py__anyhow-1.0.95", "vendor_py__anyhow-1.0.95",
"vendor_py__cc-1.2.14", "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__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", "vendor_py__tree-sitter-graph-0.7.0",
) )

View File

@@ -44,14 +44,14 @@ alias(
) )
alias( alias(
name = "clap-4.5.29", name = "clap-4.5.30",
actual = "@vendor_py__clap-4.5.29//:clap", actual = "@vendor_py__clap-4.5.30//:clap",
tags = ["manual"], tags = ["manual"],
) )
alias( alias(
name = "clap", name = "clap",
actual = "@vendor_py__clap-4.5.29//:clap", actual = "@vendor_py__clap-4.5.30//:clap",
tags = ["manual"], tags = ["manual"],
) )
@@ -68,14 +68,14 @@ alias(
) )
alias( alias(
name = "tree-sitter-0.20.10", name = "tree-sitter-0.20.4",
actual = "@vendor_py__tree-sitter-0.20.10//:tree_sitter", actual = "@vendor_py__tree-sitter-0.20.4//:tree_sitter",
tags = ["manual"], tags = ["manual"],
) )
alias( alias(
name = "tree-sitter", 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"], tags = ["manual"],
) )

View File

@@ -88,8 +88,8 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-uefi": [], "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
"//conditions:default": ["@platforms//:incompatible"], "//conditions:default": ["@platforms//:incompatible"],
}), }),
version = "4.5.29", version = "4.5.30",
deps = [ deps = [
"@vendor_py__clap_builder-4.5.29//:clap_builder", "@vendor_py__clap_builder-4.5.30//:clap_builder",
], ],
) )

View File

@@ -87,7 +87,7 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-uefi": [], "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
"//conditions:default": ["@platforms//:incompatible"], "//conditions:default": ["@platforms//:incompatible"],
}), }),
version = "4.5.29", version = "4.5.30",
deps = [ deps = [
"@vendor_py__anstream-0.6.18//:anstream", "@vendor_py__anstream-0.6.18//:anstream",
"@vendor_py__anstyle-1.0.10//:anstyle", "@vendor_py__anstyle-1.0.10//:anstyle",

View File

@@ -30,7 +30,7 @@ rust_library(
], ],
), ),
crate_root = "binding_rust/lib.rs", crate_root = "binding_rust/lib.rs",
edition = "2021", edition = "2018",
rustc_flags = [ rustc_flags = [
"--cap-lints=allow", "--cap-lints=allow",
], ],
@@ -80,10 +80,10 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-uefi": [], "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
"//conditions:default": ["@platforms//:incompatible"], "//conditions:default": ["@platforms//:incompatible"],
}), }),
version = "0.20.10", version = "0.20.4",
deps = [ deps = [
"@vendor_py__regex-1.11.1//:regex", "@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", "WORKSPACE.bazel",
], ],
), ),
edition = "2021", edition = "2018",
pkg_name = "tree-sitter", pkg_name = "tree-sitter",
rustc_flags = [ rustc_flags = [
"--cap-lints=allow", "--cap-lints=allow",
@@ -132,7 +132,7 @@ cargo_build_script(
"noclippy", "noclippy",
"norustfmt", "norustfmt",
], ],
version = "0.20.10", version = "0.20.4",
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
"@vendor_py__cc-1.2.14//:cc", "@vendor_py__cc-1.2.14//:cc",

View File

@@ -88,6 +88,6 @@ rust_library(
"@vendor_py__smallvec-1.14.0//:smallvec", "@vendor_py__smallvec-1.14.0//:smallvec",
"@vendor_py__string-interner-0.12.2//:string_interner", "@vendor_py__string-interner-0.12.2//:string_interner",
"@vendor_py__thiserror-1.0.69//:thiserror", "@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",
], ],
) )

40
misc/bazel/3rdparty/py_deps/defs.bzl generated vendored
View File

@@ -296,15 +296,15 @@ _NORMAL_DEPENDENCIES = {
"python/extractor/tsg-python": { "python/extractor/tsg-python": {
_COMMON_CONDITION: { _COMMON_CONDITION: {
"anyhow": Label("@vendor_py__anyhow-1.0.95//:anyhow"), "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"), "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"), "tree-sitter-graph": Label("@vendor_py__tree-sitter-graph-0.7.0//:tree_sitter_graph"),
}, },
}, },
"python/extractor/tsg-python/tsp": { "python/extractor/tsg-python/tsp": {
_COMMON_CONDITION: { _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( maybe(
http_archive, http_archive,
name = "vendor_py__clap-4.5.29", name = "vendor_py__clap-4.5.30",
sha256 = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184", sha256 = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d",
type = "tar.gz", type = "tar.gz",
urls = ["https://static.crates.io/crates/clap/4.5.29/download"], urls = ["https://static.crates.io/crates/clap/4.5.30/download"],
strip_prefix = "clap-4.5.29", strip_prefix = "clap-4.5.30",
build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.29.bazel"), build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap-4.5.30.bazel"),
) )
maybe( maybe(
http_archive, http_archive,
name = "vendor_py__clap_builder-4.5.29", name = "vendor_py__clap_builder-4.5.30",
sha256 = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9", sha256 = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c",
type = "tar.gz", type = "tar.gz",
urls = ["https://static.crates.io/crates/clap_builder/4.5.29/download"], urls = ["https://static.crates.io/crates/clap_builder/4.5.30/download"],
strip_prefix = "clap_builder-4.5.29", strip_prefix = "clap_builder-4.5.30",
build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.29.bazel"), build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.clap_builder-4.5.30.bazel"),
) )
maybe( maybe(
@@ -814,12 +814,12 @@ def crate_repositories():
maybe( maybe(
http_archive, http_archive,
name = "vendor_py__tree-sitter-0.20.10", name = "vendor_py__tree-sitter-0.20.4",
sha256 = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d", sha256 = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a",
type = "tar.gz", type = "tar.gz",
urls = ["https://static.crates.io/crates/tree-sitter/0.20.10/download"], urls = ["https://static.crates.io/crates/tree-sitter/0.20.4/download"],
strip_prefix = "tree-sitter-0.20.10", strip_prefix = "tree-sitter-0.20.4",
build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.10.bazel"), build_file = Label("//misc/bazel/3rdparty/py_deps:BUILD.tree-sitter-0.20.4.bazel"),
) )
maybe( maybe(
@@ -955,8 +955,8 @@ def crate_repositories():
return [ return [
struct(repo = "vendor_py__anyhow-1.0.95", is_dev_dep = False), 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__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__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), struct(repo = "vendor_py__tree-sitter-graph-0.7.0", is_dev_dep = False),
] ]

View File

@@ -90,18 +90,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "clap" name = "clap"
version = "4.5.29" version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acebd8ad879283633b343856142139f2da2317c96b05b4dd6181c61e2480184" checksum = "92b7b18d71fad5313a1e320fa9897994228ce274b60faa4d694fe0ea89cd9e6d"
dependencies = [ dependencies = [
"clap_builder", "clap_builder",
] ]
[[package]] [[package]]
name = "clap_builder" name = "clap_builder"
version = "4.5.29" version = "4.5.30"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6ba32cbda51c7e1dfd49acc1457ba1a7dec5b64fe360e828acb13ca8dc9c2f9" checksum = "a35db2071778a7344791a4fb4f95308b5673d219dee3ae348b86642574ecc90c"
dependencies = [ dependencies = [
"anstream", "anstream",
"anstyle", "anstyle",
@@ -306,9 +306,9 @@ dependencies = [
[[package]] [[package]]
name = "tree-sitter" name = "tree-sitter"
version = "0.20.10" version = "0.20.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e747b1f9b7b931ed39a548c1fae149101497de3c1fc8d9e18c62c1a66c683d3d" checksum = "4e34327f8eac545e3f037382471b2b19367725a242bba7bc45edb9efb49fe39a"
dependencies = [ dependencies = [
"cc", "cc",
"regex", "regex",

View File

@@ -10,7 +10,7 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = "1.0" anyhow = "1.0"
regex = "1" regex = "1"
tree-sitter = "0.20.4" tree-sitter = "=0.20.4"
tree-sitter-graph = "0.7.0" tree-sitter-graph = "0.7.0"
tsp = {path = "tsp"} tsp = {path = "tsp"}
clap = "4.5" clap = "4.5"