Added tr/except clauses such that mip is an optional import.

tBuLi · Sep 25, 2023 · 19c263d · 19c263d
1 parent 8e46208
commit 19c263d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 18 deletions.
diff --git a/symfit/api.py b/symfit/api.py
@@ -15,7 +15,11 @@
 from symfit.core.argument import Variable, Parameter
 from symfit.core.support import variables, parameters, D
 
-from symfit.symmip import MIP
+try:
+    # MIP is an optional feature. If no solvers are installed this will raise an import error.
+    from symfit.symmip import MIP
+except ImportError:
+    pass
 
 # Expose the sympy API
 from sympy import *
diff --git a/symfit/symmip/backend/__init__.py b/symfit/symmip/backend/__init__.py
@@ -1,2 +1,7 @@
-from .gurobi import GurobiBackend
+try:
+    # As a commercial solver, gurobi is optional.
+    from .gurobi import GurobiBackend
+except ImportError:
+    pass
+
 from .scipopt import SCIPOptBackend
diff --git a/symfit/symmip/backend/gurobi.py b/symfit/symmip/backend/gurobi.py
@@ -1,12 +1,6 @@
 from dataclasses import dataclass, field
-import importlib
-import warnings
-
-try:
-    gp = importlib.import_module('gurobipy')
-except ImportError as e:
-    warnings.warn('Install gurobipy to use this feature.')
-    gp = {}
+
+import gurobipy as gp
 
 from sympy.printing.pycode import PythonCodePrinter
 

diff --git a/symfit/symmip/backend/scipopt.py b/symfit/symmip/backend/scipopt.py
@@ -1,12 +1,6 @@
 from dataclasses import dataclass, field
-import importlib
-import warnings
-
-try:
-    scip = importlib.import_module('pyscipopt')
-except ImportError as e:
-    warnings.warn('Install pyscipopt to use this feature.')
-    scip = {}
+
+import pyscipopt as scip
 
 from sympy.printing.pycode import PythonCodePrinter