Update requirements

* requirements for minizinc 2.8.0 added
requirements for ortools updated to v9.9

* remove higher minizinc requirement, was for testing

* move minimum required version to v2.8.2

* different errors for not installed and outdated.
supported() should not raise exceptions

* cleanup formatting

* remove hard-coded minizinc call

---------

Co-authored-by: Dimos Tsouros <[email protected]>

Author: Wout4

cpmpy/__init__.py

@@ -14,7 +14,7 @@
 """
 # Tias Guns, 2019-2024
 
-__version__ = "0.9.19"
+__version__ = "0.9.20"
 
 
 from .expressions import *

cpmpy/solvers/minizinc.py

@@ -71,15 +71,32 @@ class CPM_minizinc(SolverInterface):
     The `DirectConstraint`, when used, adds a constraint with that name and the given args to the MiniZinc model.
     """
 
+    required_version = (2, 8, 2)
     @staticmethod
     def supported():
+        return CPM_minizinc.installed() and not CPM_minizinc.outdated()
+
+    @staticmethod
+    def installed():
         # try to import the package
         try:
             import minizinc
             return True
         except ImportError as e:
             return False
 
+    @staticmethod
+    def outdated():
+        from minizinc import default_driver
+        if default_driver.parsed_version >= CPM_minizinc.required_version:
+            return False
+        else:
+            #outdated
+            return True
+
+
+
+
     @staticmethod
     def solvernames():
         """
@@ -116,8 +133,13 @@ def __init__(self, cpm_model=None, subsolver=None):
         - subsolver: str, name of a subsolver (optional)
                           has to be one of solvernames()
         """
-        if not self.supported():
+        if not self.installed():
             raise Exception("CPM_minizinc: Install the python package 'minizinc'")
+        elif self.outdated():
+            version = str(self.required_version[0])
+            for x in self.required_version[1:]:
+                version = version + "." + str(x)
+            raise ImportError("Your Minizinc compiler is outdated, please upgrade to a version >= " + version)
 
         import minizinc
 

docs/conf.py

@@ -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 = {

requirements.txt

@@ -1,2 +1,2 @@
 numpy < 2.0
-ortools >= 9.6
+ortools >= 9.9

tests/test_globalconstraints.py

@@ -830,7 +830,7 @@ def test_cumulative(self):
         b = cp.boolvar()
         a = cp.boolvar()
 
-        self.assertTrue(cp.Model([cp.Cumulative([x,y],[x,2],[z,q],1,x)]).solve(solver="minizinc:com.google.ortools.sat"))
+        self.assertTrue(cp.Model([cp.Cumulative([x,y],[x,2],[z,q],1,x)]).solve())
         self.assertRaises(TypeError, cp.Cumulative, [x,y],[x,y],[a,y],1,x)
         self.assertRaises(TypeError, cp.Cumulative, [x,y],[x,y],[x,y],1,x)
         self.assertRaises(TypeError, cp.Cumulative, [x,y],[x,y],[x,y],x,False)