git: c0122f5d4bab - main - math/{,py-}or-tools: Update 9.4 -> 9.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 01 Jan 2023 22:21:27 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c0122f5d4babbde9a52231544aed2ec31cabeb70
commit c0122f5d4babbde9a52231544aed2ec31cabeb70
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-01-01 22:05:29 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-01-01 22:21:19 +0000
math/{,py-}or-tools: Update 9.4 -> 9.5
---
math/or-tools/Makefile | 5 +-
math/or-tools/distinfo | 6 +--
math/or-tools/pkg-plist | 65 +++++++++++++++++++++----
math/py-or-tools/Makefile | 3 +-
math/py-or-tools/distinfo | 6 +--
math/py-or-tools/files/patch-cmake_python.cmake | 16 +++---
math/py-or-tools/pkg-plist | 13 +++--
7 files changed, 81 insertions(+), 33 deletions(-)
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index ca93c3ac7173..010d49994394 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,7 +1,6 @@
PORTNAME= or-tools
DISTVERSIONPREFIX= v
-DISTVERSION= 9.4
-PORTREVISION= 1
+DISTVERSION= 9.5
CATEGORIES= math
MAINTAINER= yuri@FreeBSD.org
@@ -52,7 +51,7 @@ SCIP_LIB_DEPENDS= libscip.so:math/SCIP
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-//}
PORTDOCS= *
-# 4 tests are known to fail, see https://github.com/google/or-tools/issues/3429
+# 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429
post-install:
@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
diff --git a/math/or-tools/distinfo b/math/or-tools/distinfo
index cf40574c2376..769e10a9b515 100644
--- a/math/or-tools/distinfo
+++ b/math/or-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660340684
-SHA256 (google-or-tools-v9.4_GH0.tar.gz) = 180fbc45f6e5ce5ff153bea2df0df59b15346f2a7f8ffbd7cb4aed0fb484b8f6
-SIZE (google-or-tools-v9.4_GH0.tar.gz) = 14411489
+TIMESTAMP = 1672576120
+SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939
+SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911
diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist
index 057a80d5bbcc..9e5e1a7fe484 100644
--- a/math/or-tools/pkg-plist
+++ b/math/or-tools/pkg-plist
@@ -14,12 +14,18 @@ include/ortools/base/base_export.h
include/ortools/base/basictypes.h
include/ortools/base/bitmap.h
include/ortools/base/case.h
+include/ortools/base/check.h
include/ortools/base/cleanup.h
include/ortools/base/commandlineflags.h
include/ortools/base/container_logging.h
+include/ortools/base/die_if_null.h
+include/ortools/base/dump_vars.h
include/ortools/base/dynamic_library.h
include/ortools/base/encodingutils.h
include/ortools/base/file.h
+include/ortools/base/filesystem.h
+include/ortools/base/flags.h
+include/ortools/base/gzipfile.h
include/ortools/base/gzipstring.h
include/ortools/base/hash.h
include/ortools/base/helpers.h
@@ -29,6 +35,7 @@ include/ortools/base/integral_types.h
include/ortools/base/iterator_adaptors.h
include/ortools/base/jniutil.h
include/ortools/base/linked_hash_map.h
+include/ortools/base/log.h
include/ortools/base/log_severity.h
include/ortools/base/logging.h
include/ortools/base/logging_export.h
@@ -38,7 +45,12 @@ include/ortools/base/logging_utilities.h
include/ortools/base/macros.h
include/ortools/base/map_util.h
include/ortools/base/mathutil.h
+include/ortools/base/memfile.h
+include/ortools/base/mock-log.h
include/ortools/base/murmur.h
+include/ortools/base/mutable_memfile.h
+include/ortools/base/numbers.h
+include/ortools/base/options.h
include/ortools/base/path.h
include/ortools/base/protobuf_util.h
include/ortools/base/protoutil.h
@@ -56,12 +68,12 @@ include/ortools/base/strong_int.h
include/ortools/base/strong_vector.h
include/ortools/base/strtoint.h
include/ortools/base/sysinfo.h
-include/ortools/base/thorough_hash.h
include/ortools/base/threadpool.h
include/ortools/base/timer.h
include/ortools/base/typeid.h
include/ortools/base/version.h
include/ortools/base/vlog_is_on.h
+include/ortools/base/zipfile.h
include/ortools/bop/bop_base.h
include/ortools/bop/bop_fs.h
include/ortools/bop/bop_lns.h
@@ -151,7 +163,6 @@ include/ortools/gscip/legacy_scip_params.h
include/ortools/gurobi/environment.h
include/ortools/init/init.h
include/ortools/linear_solver/glop_utils.h
-include/ortools/linear_solver/gurobi_proto_solver.h
include/ortools/linear_solver/linear_expr.h
include/ortools/linear_solver/linear_solver.h
include/ortools/linear_solver/linear_solver.pb.h
@@ -159,12 +170,15 @@ include/ortools/linear_solver/linear_solver_callback.h
include/ortools/linear_solver/model_exporter.h
include/ortools/linear_solver/model_exporter_swig_helper.h
include/ortools/linear_solver/model_validator.h
-include/ortools/linear_solver/pdlp_proto_solver.h
-include/ortools/linear_solver/sat_proto_solver.h
-include/ortools/linear_solver/sat_solver_utils.h
+include/ortools/linear_solver/proto_solver/gurobi_proto_solver.h
+include/ortools/linear_solver/proto_solver/highs_proto_solver.h
+include/ortools/linear_solver/proto_solver/pdlp_proto_solver.h
+include/ortools/linear_solver/proto_solver/sat_proto_solver.h
+include/ortools/linear_solver/proto_solver/sat_solver_utils.h
+include/ortools/linear_solver/proto_solver/scip_proto_solver.h
include/ortools/linear_solver/scip_callback.h
include/ortools/linear_solver/scip_helper_macros.h
-include/ortools/linear_solver/scip_proto_solver.h
+include/ortools/linear_solver/wrappers/model_builder_helper.h
include/ortools/lp_data/lp_data.h
include/ortools/lp_data/lp_data_utils.h
include/ortools/lp_data/lp_decomposer.h
@@ -183,9 +197,20 @@ include/ortools/lp_data/sparse.h
include/ortools/lp_data/sparse_column.h
include/ortools/lp_data/sparse_row.h
include/ortools/lp_data/sparse_vector.h
+include/ortools/math_opt/constraints/indicator/indicator_constraint.h
+include/ortools/math_opt/constraints/indicator/storage.h
+include/ortools/math_opt/constraints/indicator/validator.h
+include/ortools/math_opt/constraints/quadratic/quadratic_constraint.h
+include/ortools/math_opt/constraints/quadratic/storage.h
include/ortools/math_opt/constraints/quadratic/validator.h
+include/ortools/math_opt/constraints/sos/sos1_constraint.h
+include/ortools/math_opt/constraints/sos/sos2_constraint.h
+include/ortools/math_opt/constraints/sos/storage.h
+include/ortools/math_opt/constraints/sos/util.h
include/ortools/math_opt/constraints/sos/validator.h
+include/ortools/math_opt/constraints/util/model_util.h
include/ortools/math_opt/core/arrow_operator_proxy.h
+include/ortools/math_opt/core/invalid_indicators.h
include/ortools/math_opt/core/inverted_bounds.h
include/ortools/math_opt/core/math_opt_proto_utils.h
include/ortools/math_opt/core/model_summary.h
@@ -241,10 +266,18 @@ include/ortools/math_opt/solvers/gurobi_solver.h
include/ortools/math_opt/solvers/message_callback_data.h
include/ortools/math_opt/solvers/pdlp_bridge.h
include/ortools/math_opt/solvers/pdlp_solver.h
+include/ortools/math_opt/storage/atomic_constraint_storage.h
+include/ortools/math_opt/storage/iterators.h
+include/ortools/math_opt/storage/linear_constraint_storage.h
include/ortools/math_opt/storage/model_storage.h
include/ortools/math_opt/storage/model_storage_types.h
+include/ortools/math_opt/storage/objective_storage.h
+include/ortools/math_opt/storage/range.h
+include/ortools/math_opt/storage/sorted.h
+include/ortools/math_opt/storage/sparse_coefficient_map.h
include/ortools/math_opt/storage/sparse_matrix.h
include/ortools/math_opt/storage/update_trackers.h
+include/ortools/math_opt/storage/variable_storage.h
include/ortools/math_opt/validators/callback_validator.h
include/ortools/math_opt/validators/enum_sets.h
include/ortools/math_opt/validators/ids_validator.h
@@ -258,7 +291,6 @@ include/ortools/math_opt/validators/solve_parameters_validator.h
include/ortools/math_opt/validators/solve_stats_validator.h
include/ortools/math_opt/validators/sparse_matrix_validator.h
include/ortools/math_opt/validators/sparse_vector_validator.h
-include/ortools/model_builder/wrappers/model_builder_helper.h
include/ortools/packing/arc_flow_builder.h
include/ortools/packing/arc_flow_solver.h
include/ortools/packing/binpacking_2d_parser.h
@@ -282,6 +314,15 @@ include/ortools/port/file.h
include/ortools/port/proto_utils.h
include/ortools/port/sysinfo.h
include/ortools/port/utf8.h
+include/ortools/routing/carp_parser.h
+include/ortools/routing/cvrptw_lib.h
+include/ortools/routing/nearp_parser.h
+include/ortools/routing/pdtsp_parser.h
+include/ortools/routing/simple_graph.h
+include/ortools/routing/solomon_parser.h
+include/ortools/routing/solution_serializer.h
+include/ortools/routing/tsplib_parser.h
+include/ortools/routing/tsptw_parser.h
include/ortools/sat/all_different.h
include/ortools/sat/boolean_problem.h
include/ortools/sat/boolean_problem.pb.h
@@ -308,6 +349,7 @@ include/ortools/sat/cumulative_energy.h
include/ortools/sat/cuts.h
include/ortools/sat/diffn.h
include/ortools/sat/diffn_util.h
+include/ortools/sat/diophantine.h
include/ortools/sat/disjunctive.h
include/ortools/sat/drat_checker.h
include/ortools/sat/drat_proof_handler.h
@@ -324,6 +366,7 @@ include/ortools/sat/lb_tree_search.h
include/ortools/sat/linear_constraint.h
include/ortools/sat/linear_constraint_manager.h
include/ortools/sat/linear_programming_constraint.h
+include/ortools/sat/linear_propagation.h
include/ortools/sat/linear_relaxation.h
include/ortools/sat/lp_utils.h
include/ortools/sat/max_hs.h
@@ -338,6 +381,7 @@ include/ortools/sat/probing.h
include/ortools/sat/pseudo_costs.h
include/ortools/sat/restart.h
include/ortools/sat/rins.h
+include/ortools/sat/routing_cuts.h
include/ortools/sat/sat_base.h
include/ortools/sat/sat_decision.h
include/ortools/sat/sat_inprocessing.h
@@ -369,6 +413,7 @@ include/ortools/util/bitset.h
include/ortools/util/cached_log.h
include/ortools/util/file_util.h
include/ortools/util/filelineiter.h
+include/ortools/util/flat_matrix.h
include/ortools/util/fp_roundtrip_conv.h
include/ortools/util/fp_utils.h
include/ortools/util/functions_swig_helpers.h
@@ -379,9 +424,11 @@ include/ortools/util/lazy_mutable_copy.h
include/ortools/util/logging.h
include/ortools/util/monoid_operation_tree.h
include/ortools/util/optional_boolean.pb.h
+include/ortools/util/parse_proto.h
include/ortools/util/permutation.h
include/ortools/util/piecewise_linear_function.h
include/ortools/util/proto_tools.h
+include/ortools/util/qap_reader.h
include/ortools/util/random_engine.h
include/ortools/util/range_minimum_query.h
include/ortools/util/range_query_function.h
@@ -415,10 +462,10 @@ lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/ortools/ortoolsTargets.cmake
lib/libortools.so
lib/libortools.so.9
-lib/libortools.so.9.4.9999
+lib/libortools.so.9.5.9999
%%FLATZINC%%lib/libortools_flatzinc.so
%%FLATZINC%%lib/libortools_flatzinc.so.9
-%%FLATZINC%%lib/libortools_flatzinc.so.9.4.9999
+%%FLATZINC%%lib/libortools_flatzinc.so.9.5.9999
%%FLATZINC%%share/minizinc/ortools/fzn_all_different_int.mzn
%%FLATZINC%%share/minizinc/ortools/fzn_circuit.mzn
%%FLATZINC%%share/minizinc/ortools/fzn_cumulative.mzn
diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index ece8f53722c7..7b28515ee90f 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,7 +1,6 @@
PORTNAME= or-tools
DISTVERSIONPREFIX= v
-DISTVERSION= 9.4
-PORTREVISION= 1
+DISTVERSION= 9.5
CATEGORIES= math
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/math/py-or-tools/distinfo b/math/py-or-tools/distinfo
index f6d1e4ce1b01..f3b496e5344c 100644
--- a/math/py-or-tools/distinfo
+++ b/math/py-or-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660356537
-SHA256 (google-or-tools-v9.4_GH0.tar.gz) = 180fbc45f6e5ce5ff153bea2df0df59b15346f2a7f8ffbd7cb4aed0fb484b8f6
-SIZE (google-or-tools-v9.4_GH0.tar.gz) = 14411489
+TIMESTAMP = 1672604938
+SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939
+SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911
diff --git a/math/py-or-tools/files/patch-cmake_python.cmake b/math/py-or-tools/files/patch-cmake_python.cmake
index 8e5e3e4d5f7b..487171ac1b2b 100644
--- a/math/py-or-tools/files/patch-cmake_python.cmake
+++ b/math/py-or-tools/files/patch-cmake_python.cmake
@@ -1,6 +1,6 @@
---- cmake/python.cmake.orig 2021-12-14 20:57:53 UTC
+--- cmake/python.cmake.orig 2022-11-25 09:21:54 UTC
+++ cmake/python.cmake
-@@ -23,7 +23,7 @@ if(UNIX AND NOT APPLE)
+@@ -40,7 +40,7 @@ if(UNIX AND NOT APPLE)
endif()
# Find Python 3
@@ -9,15 +9,15 @@
list(APPEND CMAKE_SWIG_FLAGS "-py3" "-DPY3")
# Find if the python module is available,
-@@ -294,9 +294,9 @@ if(BUILD_TESTING)
- #COMMAND ${VENV_EXECUTABLE} ${VENV_DIR}
+@@ -367,9 +367,9 @@ if(BUILD_VENV)
# Must NOT call it in a folder containing the setup.py otherwise pip call it
# (i.e. "python setup.py bdist") while we want to consume the wheel package
-- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT}
-+ COMMAND ${VENV_Python3_EXECUTABLE} -m pip install --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT}
+ COMMAND ${VENV_Python3_EXECUTABLE} -m pip install
+- --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT}==${PROJECT_VERSION}
++ --no-index --find-links=${CMAKE_CURRENT_BINARY_DIR}/python/dist ${PYTHON_PROJECT}==${PROJECT_VERSION}
# install modules only required to run examples
-- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib
-+ #COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib
+- COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib pytest
++ #COMMAND ${VENV_Python3_EXECUTABLE} -m pip install pandas matplotlib pytest
BYPRODUCTS ${VENV_DIR}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Create venv and install ${PYTHON_PROJECT}"
diff --git a/math/py-or-tools/pkg-plist b/math/py-or-tools/pkg-plist
index 54da83336fa3..9fa42e4ba88a 100644
--- a/math/py-or-tools/pkg-plist
+++ b/math/py-or-tools/pkg-plist
@@ -38,12 +38,11 @@
%%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_natural_api.py
%%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_pb2.py
%%PYTHON_SITELIBDIR%%/ortools/linear_solver/linear_solver_pb2.pyi
+%%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/__init__.py
+%%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/model_builder.py
+%%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/model_builder_helper.py
+%%PYTHON_SITELIBDIR%%/ortools/linear_solver/python/pywrap_model_builder_helper%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/ortools/linear_solver/pywraplp.py
-%%PYTHON_SITELIBDIR%%/ortools/model_builder/__init__.py
-%%PYTHON_SITELIBDIR%%/ortools/model_builder/python/__init__.py
-%%PYTHON_SITELIBDIR%%/ortools/model_builder/python/model_builder.py
-%%PYTHON_SITELIBDIR%%/ortools/model_builder/python/model_builder_helper.py
-%%PYTHON_SITELIBDIR%%/ortools/model_builder/python/pywrap_model_builder_helper%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/ortools/packing/__init__.py
%%PYTHON_SITELIBDIR%%/ortools/packing/multiple_dimensions_bin_packing_pb2.py
%%PYTHON_SITELIBDIR%%/ortools/packing/multiple_dimensions_bin_packing_pb2.pyi
@@ -56,14 +55,18 @@
%%PYTHON_SITELIBDIR%%/ortools/pdlp/solvers_pb2.pyi
%%PYTHON_SITELIBDIR%%/ortools/sat/__init__.py
%%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.py
+%%PYTHON_SITELIBDIR%%/ortools/sat/boolean_problem_pb2.pyi
%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.py
+%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_pb2.pyi
%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.py
+%%PYTHON_SITELIBDIR%%/ortools/sat/cp_model_service_pb2.pyi
%%PYTHON_SITELIBDIR%%/ortools/sat/python/__init__.py
%%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model.py
%%PYTHON_SITELIBDIR%%/ortools/sat/python/cp_model_helper.py
%%PYTHON_SITELIBDIR%%/ortools/sat/python/swig_helper%%PYTHON_EXT_SUFFIX%%.so
%%PYTHON_SITELIBDIR%%/ortools/sat/python/visualization.py
%%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.py
+%%PYTHON_SITELIBDIR%%/ortools/sat/sat_parameters_pb2.pyi
%%PYTHON_SITELIBDIR%%/ortools/scheduling/__init__.py
%%PYTHON_SITELIBDIR%%/ortools/scheduling/_pywraprcpsp.so
%%PYTHON_SITELIBDIR%%/ortools/scheduling/course_scheduling_pb2.py