Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package google-or-tools for openSUSE:Factory
checked in at 2023-08-08 16:18:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/google-or-tools (Old)
and /work/SRC/openSUSE:Factory/.google-or-tools.new.22712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "google-or-tools"
Tue Aug 8 16:18:43 2023 rev:7 rq:1102887 version:9.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/google-or-tools/google-or-tools.changes
2023-07-10 16:39:44.958488721 +0200
+++
/work/SRC/openSUSE:Factory/.google-or-tools.new.22712/google-or-tools.changes
2023-08-08 16:18:44.666110773 +0200
@@ -1,0 +2,7 @@
+Tue Aug 8 11:36:35 UTC 2023 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Fix build with re2 2023-07-01, add
+ 0001-deps-bump-re2-to-2023-07-01.patch
+- Cleanup skipped tests
+
+-------------------------------------------------------------------
New:
----
0001-deps-bump-re2-to-2023-07-01.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ google-or-tools.spec ++++++
--- /var/tmp/diff_new_pack.4Z8izY/_old 2023-08-08 16:18:45.738117471 +0200
+++ /var/tmp/diff_new_pack.4Z8izY/_new 2023-08-08 16:18:45.742117496 +0200
@@ -32,6 +32,7 @@
Patch6: 0002-Only-add-relevant-directories-to-flatzinc-library-ex.patch
Patch7: 0003-Only-add-relevant-directories-to-sat_solver-RUNPATHs.patch
Patch8: 0001-base-Remove-AbslStringify.patch
+Patch9: 0001-deps-bump-re2-to-2023-07-01.patch
BuildRequires: abseil-cpp-devel >= 20230105.0
BuildRequires: cmake >= 3.18
BuildRequires: fdupes
@@ -133,19 +134,16 @@
%postun -n libortools_flatzinc%{sonum} -p /sbin/ldconfig
%check
-# https://github.com/google/or-tools/issues/3461
-sed -i -e 's/max_time_in_seconds = 15.0/max_time_in_seconds = 30.0/'
examples/python/prize_collecting_vrp_sat.py
%if %{with tests}
-# Tests using e.g. SCIP are not skipped, exclude
+# Some tests using e.g. SCIP are not skipped, exclude
# https://github.com/google/or-tools/issues/3261
-%define known_fail
'python.*mip|python_contrib.*|python_linear_solver_integer_programming_example|python_python_appointments|python_python_steel_mill_slab_sat|cxx_tests_issue173|python_tests_dual_loading|python_tests_pywraplp_test|python_linear_solver_model_builder_test'
+%define known_fail 'python_linear_solver_model_builder_test'
%if %{__isa_bits} == 32
%ctest --exclude-regex %{known_fail} || true
%else
echo "Run tests known to fail"
%ctest --include-regex %{known_fail} || true
echo "Run good tests"
-# More tests depending on SCIP
%ctest --exclude-regex %{known_fail}
%endif
%endif
++++++ 0001-deps-bump-re2-to-2023-07-01.patch ++++++
>From c5a2fa1eb673bf652cb9ad4f5049d054b8166e17 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corent...@google.com>
Date: Wed, 5 Jul 2023 15:13:59 +0200
Subject: [PATCH] deps: bump re2 to 2023-07-01
---
WORKSPACE | 2 +-
cmake/dependencies/CMakeLists.txt | 4 +--
ortools/lp_data/lp_parser.cc | 9 +++---
patches/BUILD.bazel | 1 -
patches/re2-2023-03-01.patch | 48 -------------------------------
5 files changed, 7 insertions(+), 57 deletions(-)
delete mode 100644 patches/re2-2023-03-01.patch
diff --git a/ortools/lp_data/lp_parser.cc b/ortools/lp_data/lp_parser.cc
index 58286306e5b..bd26c019abe 100644
--- a/ortools/lp_data/lp_parser.cc
+++ b/ortools/lp_data/lp_parser.cc
@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece line) {
bool LPParser::ParseConstraint(StringPiece constraint) {
const StatusOr<ParsedConstraint> parsed_constraint_or_status =
- ::operations_research::glop::ParseConstraint(constraint.as_string());
+ ::operations_research::glop::ParseConstraint(constraint);
if (!parsed_constraint_or_status.ok()) return false;
const ParsedConstraint& parsed_constraint =
parsed_constraint_or_status.value();
@@ -342,10 +342,9 @@ TokenType LPParser::ConsumeToken(StringPiece* sp) {
} // namespace
-StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint_view) {
+StatusOr<ParsedConstraint> ParseConstraint(absl::string_view constraint) {
ParsedConstraint parsed_constraint;
// Get the name, if present.
- StringPiece constraint{constraint_view};
StringPiece constraint_copy{constraint};
std::string consumed_name;
Fractional consumed_coeff;
@@ -413,8 +412,8 @@ StatusOr<ParsedConstraint>
ParseConstraint(absl::string_view constraint_view) {
right_bound = consumed_coeff;
if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) !=
TokenType::END) {
- return absl::InvalidArgumentError(absl::StrCat(
- "End of input was expected, found: ", constraint.as_string()));
+ return absl::InvalidArgumentError(
+ absl::StrCat("End of input was expected, found: ", constraint));
}
}
