Merge branch 'main' into issue-3184

pyomo/contrib/appsi/solvers/ipopt.py

@@ -147,6 +147,7 @@ def __init__(self, only_child_vars=False):
         self._primal_sol = ComponentMap()
         self._reduced_costs = ComponentMap()
         self._last_results_object: Optional[Results] = None
+        self._version_timeout = 2
 
     def available(self):
         if self.config.executable.path() is None:
@@ -158,7 +159,7 @@ def available(self):
     def version(self):
         results = subprocess.run(
             [str(self.config.executable), '--version'],
-            timeout=1,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/contrib/solver/ipopt.py

@@ -9,6 +9,7 @@
 #  This software is distributed under the 3-clause BSD License.
 #  ___________________________________________________________________________
 
+import logging
 import os
 import subprocess
 import datetime
@@ -39,8 +40,6 @@
 from pyomo.core.base.suffix import Suffix
 from pyomo.common.collections import ComponentMap
 
-import logging
-
 logger = logging.getLogger(__name__)
 
 
@@ -207,6 +206,7 @@ def __init__(self, **kwds):
         self._writer = NLWriter()
         self._available_cache = None
         self._version_cache = None
+        self._version_timeout = 2
 
     def available(self, config=None):
         if config is None:
@@ -229,7 +229,7 @@ def version(self, config=None):
             else:
                 results = subprocess.run(
                     [str(pth), '--version'],
-                    timeout=1,
+                    timeout=self._version_timeout,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.STDOUT,
                     universal_newlines=True,

pyomo/opt/solver/shellcmd.py

@@ -60,6 +60,7 @@ def __init__(self, **kwargs):
         # a solver plugin may not report execution time.
         self._last_solve_time = None
         self._define_signal_handlers = None
+        self._version_timeout = 2
 
         if executable is not None:
             self.set_executable(name=executable, validate=validate)

pyomo/solvers/plugins/solvers/CONOPT.py

@@ -79,7 +79,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec],
-            timeout=1,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/CPLEX.py

@@ -404,7 +404,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec, '-c', 'quit'],
-            timeout=1,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/GLPK.py

@@ -19,6 +19,7 @@
 
 from pyomo.common import Executable
 from pyomo.common.collections import Bunch
+from pyomo.common.errors import ApplicationError
 from pyomo.opt import (
     SolverFactory,
     OptSolver,
@@ -137,7 +138,7 @@ def _get_version(self, executable=None):
             [executable, "--version"],
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
-            timeout=1,
+            timeout=self._version_timeout,
             universal_newlines=True,
         )
         return _extract_version(result.stdout)

pyomo/solvers/plugins/solvers/IPOPT.py

@@ -79,7 +79,7 @@ def _get_version(self):
             return _extract_version('')
         results = subprocess.run(
             [solver_exec, "-v"],
-            timeout=1,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,

pyomo/solvers/plugins/solvers/SCIPAMPL.py

@@ -103,7 +103,7 @@ def _get_version(self, solver_exec=None):
                 return _extract_version('')
         results = subprocess.run(
             [solver_exec, "--version"],
-            timeout=1,
+            timeout=self._version_timeout,
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,
             universal_newlines=True,