Skip to content

Commit a6651c2

Browse files
authored
bump ortools compat up to 9.14 (cvxpy#2892)
1 parent 1978039 commit a6651c2

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

continuous_integration/install_optional_solvers.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ if [[ "$RUNNER_OS" != "macOS" ]] || [[ $(uname -m) != "x86_64" ]]; then
1515
fi
1616

1717
if [[ "$PYTHON_VERSION" == "3.12" ]]; then
18-
python -m pip install "ortools>=9.7,<9.12"
18+
python -m pip install "ortools>=9.7,<9.15"
1919
fi
2020

2121
if [[ "$RUNNER_OS" == "Windows" ]]; then

cvxpy/reductions/solvers/conic_solvers/glop_conif.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ def import_solver(self) -> None:
5252
if Version(ortools.__version__) < Version('9.5.0'):
5353
raise RuntimeError(f'Version of ortools ({ortools.__version__}) '
5454
f'is too old. Expected >= 9.5.0.')
55-
if Version(ortools.__version__) >= Version('9.12.0'):
55+
if Version(ortools.__version__) >= Version('9.15.0'):
5656
raise RuntimeError('Unrecognized new version of ortools '
57-
f'({ortools.__version__}). Expected < 9.12.0. '
57+
f'({ortools.__version__}). Expected < 9.15.0. '
5858
'Please open a feature request on cvxpy to '
5959
'enable support for this version.')
6060

cvxpy/reductions/solvers/conic_solvers/pdlp_conif.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ def import_solver(self) -> None:
5252
if Version(ortools.__version__) < Version('9.7.0'):
5353
raise RuntimeError(f'Version of ortools ({ortools.__version__}) '
5454
f'is too old. Expected >= 9.7.0.')
55-
if Version(ortools.__version__) >= Version('9.12.0'):
55+
if Version(ortools.__version__) >= Version('9.15.0'):
5656
raise RuntimeError('Unrecognized new version of ortools '
57-
f'({ortools.__version__}). Expected < 9.12.0. '
57+
f'({ortools.__version__}). Expected < 9.15.0. '
5858
'Please open a feature request on cvxpy to '
5959
'enable support for this version.')
6060

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ CVXOPT = ["cvxopt"]
7474
DIFFCP = ["diffcp"]
7575
ECOS = ["ecos"]
7676
ECOS_BB = ["ecos"]
77-
GLOP = ["ortools>=9.7,<9.12"]
77+
GLOP = ["ortools>=9.7,<9.15"]
7878
GLPK = ["cvxopt"]
7979
GLPK_MI = ["cvxopt"]
8080
GUROBI = ["gurobipy"]
8181
HIGHS = ["highspy"]
8282
MOSEK = ["Mosek"]
8383
OSQP = []
84-
PDLP = ["ortools>=9.7,<9.12"]
84+
PDLP = ["ortools>=9.7,<9.15"]
8585
PIQP = ["piqp"]
8686
PROXQP = ["proxsuite"]
8787
QOCO = ["qoco"]

0 commit comments

Comments
 (0)