Skip to content

Commit

Permalink
requirements for minizinc 2.8.0 added
Browse files Browse the repository at this point in the history
requirements for ortools updated to v9.9
  • Loading branch information
Wout4 committed Mar 25, 2024
1 parent b4fa906 commit 42c806c
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cpmpy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"""
# Tias Guns, 2019-2024

__version__ = "0.9.19"
__version__ = "0.9.20"


from .expressions import *
Expand Down
10 changes: 9 additions & 1 deletion cpmpy/solvers/minizinc.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,15 @@ def supported():
# try to import the package
try:
import minizinc
return True
from minizinc import default_driver
version_tuple = (2, 8, 0) # minimum required version
if default_driver.parsed_version >= (2, 8, 3):
return True
else:
version = str(version_tuple[0])
for x in version_tuple[1:]:
version = version + "." + str(x)
raise NotSupportedError("Your Minizinc compiler is outdated, please upgrade to a version >= " + version)
except ImportError as e:
return False

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
author = 'Tias Guns'

# The full version, including alpha/beta/rc tags
release = '0.9.19'
release = '0.9.20'

# variables to be accessed from html
html_context = {
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy < 2.0
ortools >= 9.6
ortools >= 9.9

0 comments on commit 42c806c

Please sign in to comment.