Merge pull request #3384 from jsiirola/gurobi-sh-deprecation

Move away from dependence on gurobi.sh

pyomo/common/unittest.py

@@ -876,10 +876,11 @@ def filter_fcn(self, line):
             # next 6 patterns ignore entries in pstats reports:
             'function calls',
             'List reduced',
-            '.py:',
+            '.py:',  # timing/profiling output
             ' {built-in method',
             ' {method',
             ' {pyomo.core.expr.numvalue.as_numeric}',
+            ' {gurobipy.',
         ):
             if field in line:
                 return True

pyomo/gdp/plugins/multiple_bigm.py

@@ -72,6 +72,14 @@
 }
 
 
+def Solver(val):
+    if isinstance(val, str):
+        return SolverFactory(val)
+    if not hasattr(val, 'solve'):
+        raise ValueError("Expected a string or solver object (with solve() method)")
+    return val
+
+
 @TransformationFactory.register(
     'gdp.mbigm',
     doc="Relax disjunctive model using big-M terms specific to each disjunct",
@@ -127,7 +135,8 @@ class MultipleBigMTransformation(GDP_to_MIP_Transformation, _BigM_MixIn):
     CONFIG.declare(
         'solver',
         ConfigValue(
-            default=SolverFactory('gurobi'),
+            default='gurobi',
+            domain=Solver,
             description="A solver to use to solve the continuous subproblems for "
             "calculating the M values",
         ),