Update bazel and flatzinc (#4879)

This commit is contained in:
Guillaume Chatelet
2025-10-16 14:05:15 +02:00
committed by Corentin Le Molgat
parent 0ecd0b6535
commit ed397541f4
6 changed files with 6 additions and 41 deletions

View File

@@ -14,6 +14,8 @@
load("@gazelle//:def.bzl", "gazelle")
load("@rules_license//rules:license.bzl", "license")
package(default_applicable_licenses = [":license"])
# Expose license for external usage through bazel.
licenses(["notice"])
@@ -26,10 +28,6 @@ license(
license_text = ":LICENSE",
)
package(
default_applicable_licenses = [":license"],
)
# gazelle:build_file_name BUILD,BUILD.bazel
# gazelle:prefix github.com/google/or-tools
# gazelle:proto disable

View File

@@ -63,7 +63,7 @@ git_override(
module_name = "pybind11_bazel",
commit = "2b6082a4d9d163a52299718113fa41e4b7978db5",
patch_strip = 1,
patches = ["//patches:pybind11_bazel.patch"],
patches = ["//:patches/pybind11_bazel.patch"],
remote = "https://github.com/pybind/pybind11_bazel.git",
)
@@ -71,7 +71,7 @@ git_override(
module_name = "pybind11_abseil",
commit = "70f8b693b3b70573ca785ef62d9f48054f45d786",
patch_strip = 1,
patches = ["//patches:pybind11_abseil.patch"],
patches = ["//:patches/pybind11_abseil.patch"],
remote = "https://github.com/pybind/pybind11_abseil.git",
)

View File

@@ -2520,7 +2520,7 @@ yyreduce:
#line 2549 "parser.tab.cc"
break;
#line 2553 "parser.tab.cc"
#line 2555 "parser.tab.cc"
default:
break;

View File

@@ -470,7 +470,7 @@ cc_library(
cc_test(
name = "max_flow_test",
srcs = ["max_flow_test.cc"],
data = ["//ortools/graph/testdata:max_flow_test1.pb.txt"],
data = ["//ortools/graph:testdata/max_flow_test1.pb.txt"],
deps = [
":flow_problem_cc_proto",
":max_flow",

View File

@@ -1,16 +0,0 @@
# Copyright 2010-2025 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
exports_files([
"max_flow_test1.pb.txt",
])

View File

@@ -1,17 +0,0 @@
# Copyright 2010-2025 Google LLC
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
exports_files([
"pybind11_bazel.patch",
"pybind11_abseil.patch",
])