bazel: backport cleanup from main

google · Jan 22, 2025 · 6f48941 · 6f48941
1 parent ef13f51
commit 6f48941
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,3 +1,6 @@
+# Enable logging rc options.
+common --announce_rc
+
 # ----CONFIG OPTIONS----
 build --flag_alias=with_bop=//ortools/linear_solver:with_bop
 build --flag_alias=with_cbc=//ortools/linear_solver:with_cbc

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -26,7 +26,7 @@ bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googl
 bazel_dep(name = "highs", version = "1.9.0")
 bazel_dep(name = "platforms", version = "0.0.10")
 bazel_dep(name = "protobuf", version = "29.2", repo_name = "com_google_protobuf")
-bazel_dep(name = "pybind11_abseil", version = "202402.0", repo_name = "org_pybind11_abseil")
+bazel_dep(name = "pybind11_abseil", version = "202402.0")
 bazel_dep(name = "pybind11_bazel", version = "2.13.6")
 bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")
 bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_google_re2")

diff --git a/ortools/math_opt/core/python/BUILD.bazel b/ortools/math_opt/core/python/BUILD.bazel
@@ -52,8 +52,8 @@ pybind_extension(
             "//ortools/util:solve_interrupter",
             "@com_google_absl//absl/memory",
             "@com_google_absl//absl/status:statusor",
-            "@org_pybind11_abseil//pybind11_abseil:import_status_module",
-            "@org_pybind11_abseil//pybind11_abseil:status_casters",
+            "@pybind11_abseil//pybind11_abseil:import_status_module",
+            "@pybind11_abseil//pybind11_abseil:status_casters",
             "@pybind11_protobuf//pybind11_protobuf:native_proto_caster",
         ],
 )
diff --git a/ortools/math_opt/io/python/BUILD.bazel b/ortools/math_opt/io/python/BUILD.bazel
@@ -25,8 +25,8 @@ pybind_extension(
             "//ortools/math_opt:model_update_cc_proto",
             "//ortools/math_opt:result_cc_proto",
             "//ortools/math_opt/io:mps_converter",
-            "@org_pybind11_abseil//pybind11_abseil:import_status_module",
-            "@org_pybind11_abseil//pybind11_abseil:status_casters",
+            "@pybind11_abseil//pybind11_abseil:import_status_module",
+            "@pybind11_abseil//pybind11_abseil:status_casters",
             "@pybind11_protobuf//pybind11_protobuf:native_proto_caster",
         ],
 )
diff --git a/patches/BUILD.bazel b/patches/BUILD.bazel
@@ -13,7 +13,7 @@
 
 exports_files([
     "abseil-cpp-20240722.0.patch",
-    "highs-v1.8.1.patch",
+    "highs-v1.9.0.patch",
     "protobuf-v29.2.patch",
     "pybind11_abseil.patch",
     "pybind11_protobuf.patch",