Merge pull request #18797 from github/redsun82/update-py-deps

Python: upgrade `clap`

Author: yoff

MODULE.bazel

@@ -58,15 +58,12 @@ register_toolchains("@rust_toolchains//:all")
 py_deps = use_extension("//misc/bazel/3rdparty:py_deps_extension.bzl", "p")
 use_repo(
     py_deps,
-    "vendor__anyhow-1.0.44",
-    "vendor__cc-1.0.70",
-    "vendor__clap-2.33.3",
-    "vendor__regex-1.5.5",
-    "vendor__smallvec-1.6.1",
-    "vendor__string-interner-0.12.2",
-    "vendor__thiserror-1.0.29",
-    "vendor__tree-sitter-0.20.4",
-    "vendor__tree-sitter-graph-0.7.0",
+    "vendor_py__anyhow-1.0.95",
+    "vendor_py__cc-1.2.14",
+    "vendor_py__clap-4.5.30",
+    "vendor_py__regex-1.11.1",
+    "vendor_py__tree-sitter-0.20.4",
+    "vendor_py__tree-sitter-graph-0.7.0",
 )
 
 # deps for ruby+rust

misc/bazel/3rdparty/BUILD.bazel

@@ -29,7 +29,7 @@ crates_vendor(
         "//python/extractor/tsg-python/tsp:Cargo.toml",
     ],
     mode = "remote",
-    repository_name = "vendor",
+    repository_name = "vendor_py",
     tags = ["manual"],
     vendor_path = "py_deps",
 )

misc/bazel/3rdparty/patch_defs.py

@@ -2,15 +2,15 @@
 import re
 import pathlib
 
-label_re = re.compile(r'"@vendor//:(.+)-([\d.]+)"')
+label_re = re.compile(r'"@(vendor.*)//:(.+)-([\d.]+)"')
 
 file = pathlib.Path(sys.argv[1])
 temp = file.with_suffix(f'{file.suffix}.tmp')
 
 
 with open(file) as input, open(temp, "w") as output:
     for line in input:
-        line = label_re.sub(lambda m: f'"@vendor__{m[1]}-{m[2]}//:{m[1].replace("-", "_")}"', line)
+        line = label_re.sub(lambda m: f'"@{m[1]}__{m[2]}-{m[3]}//:{m[2].replace("-", "_")}"', line)
         output.write(line)
 
 temp.rename(file)