Merge branch 'main' into observer

Author: mrmundt

.github/workflows/test_branches.yml

@@ -375,8 +375,10 @@ jobs:
         echo ""
         echo "*** Install Pyomo dependencies ***"
         # For windows, cannot use newer setuptools because of APPSI compilation issues
+        # There seems to be some specific problem with platformdirs 4.5.0
+        # on win 3.13/3.14 as of 2025-10-23
         if test "${{matrix.TARGET}}" == 'win'; then
-            CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0"
+            CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0"
         fi
         # Note: this will fail the build if any installation fails (or
         # possibly if it outputs messages to stderr)

.github/workflows/test_pr_and_main.yml

@@ -427,8 +427,10 @@ jobs:
         echo ""
         echo "*** Install Pyomo dependencies ***"
         # For windows, cannot use newer setuptools because of APPSI compilation issues
+        # There seems to be some specific problem with platformdirs 4.5.0
+        # on win 3.13/3.14 as of 2025-10-23
         if test "${{matrix.TARGET}}" == 'win'; then
-            CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0"
+            CONDA_DEPENDENCIES="$CONDA_DEPENDENCIES setuptools<74.0.0 platformdirs!=4.5.0"
         fi
         # Note: this will fail the build if any installation fails (or
         # possibly if it outputs messages to stderr)

pyomo/contrib/piecewise/tests/test_nonlinear_to_pwl.py

@@ -19,6 +19,8 @@
 from pyomo.contrib.piecewise.transform.nonlinear_to_pwl import (
     NonlinearToPWL,
     DomainPartitioningMethod,
+    lineartree_available,
+    sklearn_available,
 )
 from pyomo.core.base.expression import _ExpressionData
 from pyomo.core.expr.compare import (
@@ -45,8 +47,6 @@
     SolverFactory('gurobi').available(exception_flag=False)
     and SolverFactory('gurobi').license_is_valid()
 )
-lineartree_available = attempt_import('lineartree')[1]
-sklearn_available = attempt_import('sklearn.linear_model')[1]
 
 
 class TestNonlinearToPWL_1D(unittest.TestCase):

pyomo/contrib/piecewise/transform/nonlinear_to_pwl.py

@@ -39,7 +39,7 @@
 from pyomo.common.collections import ComponentMap, ComponentSet
 from pyomo.common.config import ConfigDict, ConfigValue, PositiveInt, InEnum
 from pyomo.common.dependencies import attempt_import
-from pyomo.common.dependencies import numpy as np
+from pyomo.common.dependencies import numpy as np, packaging
 from pyomo.common.enums import IntEnum
 from pyomo.common.modeling import unique_component_name
 from pyomo.core.expr.numeric_expr import SumExpression
@@ -53,7 +53,28 @@
 from pyomo.repn.util import ExprType, OrderedVarRecorder
 
 
-lineartree, lineartree_available = attempt_import('lineartree')
+def _lt_importer():
+    import lineartree
+    import importlib.metadata
+
+    # linear-tree through version 0.3.5 relies on a private method from
+    # scikit-learn.  That method was removed in scikit-learn version
+    # 1.7.0.  We will report linear-tree as "unavailable" if
+    # scikit-learn is "too new."
+    lt_ver = packaging.version.parse(importlib.metadata.version('linear-tree'))
+    if lt_ver <= packaging.version.Version('0.3.5'):
+        import sklearn
+
+        skl_ver = packaging.version.parse(sklearn.__version__)
+        if skl_ver >= packaging.version.Version('1.7.0'):
+            raise ImportError(
+                f"linear-tree<=0.3.5 (found {lt_ver}) is incompatible with "
+                f"scikit-learn>=1.7.0 (found {skl_ver})"
+            )
+    return lineartree
+
+
+lineartree, lineartree_available = attempt_import('lineartree', importer=_lt_importer)
 sklearn_lm, sklearn_available = attempt_import('sklearn.linear_model')
 
 logger = logging.getLogger(__name__)

pyomo/contrib/solver/solvers/knitro/base.py

@@ -268,4 +268,6 @@ def _get_error_type(
             return NoReducedCostsError
         elif item_type is ConstraintData and value_type == ValueType.DUAL:
             return NoDualsError
-        raise DeveloperError()
+        raise DeveloperError(
+            f"Unsupported KNITRO item type {item_type} and value type {value_type}."
+        )

pyomo/contrib/solver/solvers/knitro/config.py

@@ -35,7 +35,13 @@ def __init__(
             ConfigValue(
                 domain=Bool,
                 default=False,
-                doc="KNITRO solver does not allow variable removal. We can either make the variable a continuous free variable or rebuild the whole model when variable removal is attempted. When `rebuild_model_on_remove_var` is set to True, the model will be rebuilt.",
+                doc=(
+                    "KNITRO solver does not allow variable removal. We can "
+                    "either make the variable a continuous free variable or "
+                    "rebuild the whole model when variable removal is "
+                    "attempted. When `rebuild_model_on_remove_var` is set to "
+                    "True, the model will be rebuilt."
+                ),
             ),
         )
 
@@ -44,6 +50,11 @@ def __init__(
             ConfigValue(
                 domain=Bool,
                 default=False,
-                doc="To evaluate non-linear constraints, KNITRO solver sets explicit values on variables. This option controls whether to restore the original variable values after solving.",
+                doc=(
+                    "To evaluate non-linear constraints, KNITRO solver sets "
+                    "explicit values on variables. This option controls "
+                    "whether to restore the original variable values after "
+                    "solving."
+                ),
             ),
         )

pyomo/contrib/solver/solvers/knitro/engine.py

@@ -44,18 +44,20 @@ def parse_bounds(
             if item.fixed:
                 bounds_map[BoundType.EQ][i] = value(item.value)
                 continue
-            if item.has_lb():
-                bounds_map[BoundType.LO][i] = value(item.lb)
-            if item.has_ub():
-                bounds_map[BoundType.UP][i] = value(item.ub)
+            lb, ub = item.bounds
+            if lb is not None:
+                bounds_map[BoundType.LO][i] = lb
+            if ub is not None:
+                bounds_map[BoundType.UP][i] = ub
         elif isinstance(item, ConstraintData):
+            lb, _, ub = item.to_bounded_expression(evaluate_bounds=True)
             if item.equality:
-                bounds_map[BoundType.EQ][i] = value(item.lower)
+                bounds_map[BoundType.EQ][i] = lb
                 continue
-            if item.has_lb():
-                bounds_map[BoundType.LO][i] = value(item.lower)
-            if item.has_ub():
-                bounds_map[BoundType.UP][i] = value(item.upper)
+            if lb is not None:
+                bounds_map[BoundType.LO][i] = lb
+            if ub is not None:
+                bounds_map[BoundType.UP][i] = ub
     return bounds_map
 
 
@@ -85,7 +87,7 @@ def api_set_param(param_type: int) -> Callable[..., None]:
         return knitro.KN_set_double_param
     elif param_type == knitro.KN_PARAMTYPE_STRING:
         return knitro.KN_set_char_param
-    raise DeveloperError()
+    raise DeveloperError(f"Unsupported KNITRO parameter type: {param_type}")
 
 
 def api_get_values(
@@ -101,15 +103,17 @@ def api_get_values(
             return knitro.KN_get_con_dual_values
         elif value_type == ValueType.PRIMAL:
             return knitro.KN_get_con_values
-    raise DeveloperError()
+    raise DeveloperError(
+        f"Unsupported KNITRO item type or value type: {item_type}, {value_type}"
+    )
 
 
 def api_add_items(item_type: type[ItemType]) -> Callable[..., Optional[list[int]]]:
     if item_type is VarData:
         return knitro.KN_add_vars
     elif item_type is ConstraintData:
         return knitro.KN_add_cons
-    raise DeveloperError()
+    raise DeveloperError(f"Unsupported KNITRO item type: {item_type}")
 
 
 def api_set_bnds(
@@ -129,13 +133,15 @@ def api_set_bnds(
             return knitro.KN_set_con_lobnds
         elif bound_type == BoundType.UP:
             return knitro.KN_set_con_upbnds
-    raise DeveloperError()
+    raise DeveloperError(
+        f"Unsupported KNITRO item type or bound type: {item_type}, {bound_type}"
+    )
 
 
 def api_set_types(item_type: type[ItemType]) -> Callable[..., None]:
     if item_type is VarData:
         return knitro.KN_set_var_types
-    raise DeveloperError()
+    raise DeveloperError(f"Unsupported KNITRO item type: {item_type}")
 
 
 def api_add_struct(is_obj: bool, structure_type: StructureType) -> Callable[..., None]:
@@ -153,7 +159,9 @@ def api_add_struct(is_obj: bool, structure_type: StructureType) -> Callable[...,
             return knitro.KN_add_con_linear_struct
         elif structure_type == StructureType.QUADRATIC:
             return knitro.KN_add_con_quadratic_struct
-    raise DeveloperError()
+    raise DeveloperError(
+        f"Unsupported KNITRO structure type: is_obj={is_obj}, structure_type={structure_type}"
+    )
 
 
 class Engine:

pyomo/contrib/solver/solvers/knitro/utils.py

@@ -18,6 +18,7 @@
 from pyomo.contrib.solver.solvers.knitro.typing import Function
 from pyomo.core.base.block import BlockData
 from pyomo.core.base.constraint import Constraint, ConstraintData
+from pyomo.core.base.enums import SortComponents
 from pyomo.core.base.expression import Expression
 from pyomo.core.base.objective import Objective, ObjectiveData
 from pyomo.core.base.var import VarData
@@ -51,7 +52,7 @@ def get_active_constraints(block: BlockData) -> list[ConstraintData]:
 
     """
     generator = block.component_data_objects(
-        Constraint, descend_into=True, active=True, sort=True
+        Constraint, descend_into=True, active=True, sort=SortComponents.deterministic
     )
     return list(generator)
 

pyomo/solvers/tests/checks/test_xpress_persistent.py

@@ -320,6 +320,10 @@ def test_add_column_exceptions(self):
         self.assertRaises(RuntimeError, opt.add_column, m, m.y, -2, [m.c], [1])
 
     @unittest.skipIf(not xpress_available, "xpress is not available")
+    @unittest.skipIf(
+        xpd.xpress_available and xpd.xpress.__version__ == '9.8.0',
+        "Xpress 9.8 always runs global optimizer",
+    )
     def test_nonconvexqp_locally_optimal(self):
         """Test non-convex QP for which xpress_direct should find a locally
         optimal solution."""