global search and replace pyomo.core.expr.current -> pyomo.core.expr …

…(ref pyomo PR #2910) (#1234)

* global search and replace pyomo.core.expr.current -> pyomo.core.expr

* changed setup.py to refer to appropriate tag

---------

Co-authored-by: strahlw <willstrahl32@gmail.com>

idaes/apps/uncertainty_propagation/sens.py

@@ -33,7 +33,7 @@
     check_optimal_termination,
 )
 from pyomo.common.sorting import sorted_robust
-from pyomo.core.expr.current import ExpressionReplacementVisitor
+from pyomo.core.expr import ExpressionReplacementVisitor
 
 from pyomo.common.modeling import unique_component_name
 from pyomo.opt import SolverFactory, SolverStatus

idaes/core/util/model_statistics.py

@@ -22,7 +22,7 @@
 
 from pyomo.environ import Block, Constraint, Expression, Objective, Var, value
 from pyomo.dae import DerivativeVar
-from pyomo.core.expr.current import identify_variables
+from pyomo.core.expr import identify_variables
 from pyomo.common.collections import ComponentSet
 
 

idaes/models_extra/gas_distribution/properties/natural_gas.py

@@ -27,7 +27,7 @@
 from pyomo.core.base.constraint import Constraint
 from pyomo.core.base.expression import Expression
 from pyomo.core.base.param import Param
-from pyomo.core.expr.current import sqrt
+from pyomo.core.expr import sqrt
 
 # Import IDAES cores
 from idaes.core import (

idaes/models_extra/gas_distribution/unit_models/pipeline.py

@@ -31,7 +31,7 @@
 from pyomo.core.base.units_container import units as pyunits
 from pyomo.core.base.reference import Reference
 from pyomo.dae.diffvar import DerivativeVar
-from pyomo.core.expr.current import log10
+from pyomo.core.expr import log10
 from pyomo.core.expr.numvalue import value as pyo_value
 
 from idaes.core import (

idaes/models_extra/power_generation/unit_models/steamheater.py

@@ -26,7 +26,7 @@
 # Import Pyomo libraries
 from pyomo.common.config import ConfigBlock, ConfigValue, In, Bool
 from pyomo.environ import value, Var, Param, asin, cos, Reference
-from pyomo.core.expr.current import Expr_if
+from pyomo.core.expr import Expr_if
 from pyomo.dae import DerivativeVar
 
 # Import IDAES cores

idaes/models_extra/power_generation/unit_models/waterwall_section.py

@@ -37,7 +37,7 @@
 )
 from pyomo.dae import DerivativeVar
 from pyomo.common.config import ConfigBlock, ConfigValue, In, Bool
-from pyomo.core.expr.current import Expr_if
+from pyomo.core.expr import Expr_if
 
 # Import IDAES cores
 from idaes.core import (

setup.py

@@ -126,7 +126,7 @@ def __getitem__(self, key):
     # Put abstract (non-versioned) deps here.
     # Concrete dependencies go in requirements[-dev].txt
     install_requires=[
-        "pyomo>=6.6.1",
+        "pyomo @ https://github.com/IDAES/pyomo/archive/6.6.2.idaes.2023.07.28.zip",
         "pint",  # required to use Pyomo units
         "networkx",  # required to use Pyomo network
         "numpy",