Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove (part of) the remaining Pyomo 6.6.2 deprecations #1247

Merged
merged 2 commits into from
Aug 25, 2023
Merged

Remove (part of) the remaining Pyomo 6.6.2 deprecations #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b1c6c
Update pyomo.core.expr imports to remove deprecated common component
lbianchi-lbl Aug 24, 2023
95a9484
Merge branch 'main' into fix-pyomo-6.2.2-depr
lbianchi-lbl Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion idaes/core/plugins/simple_equality_eliminator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import pyomo.environ as pyo
from pyomo.core.base.transformation import TransformationFactory
from pyomo.core.plugins.transform.hierarchy import NonIsomorphicTransformation
from pyomo.core.expr import current as EXPR
from pyomo.core import expr as EXPR
from pyomo.contrib.fbbt.fbbt import compute_bounds_on_expr
from pyomo.repn import generate_standard_repn
import idaes.logger as idaeslog
Expand Down
2 changes: 1 addition & 1 deletion idaes/core/plugins/variable_replace.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

from pyomo.core.base.transformation import TransformationFactory
from pyomo.core.plugins.transform.hierarchy import NonIsomorphicTransformation
from pyomo.core.expr import current as EXPR
from pyomo.core import expr as EXPR
from pyomo.common.config import (
ConfigBlock,
ConfigValue,
Expand Down
2 changes: 1 addition & 1 deletion idaes/core/surrogate/pysmo/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

__author__ = "Oluwamayowa Amusat, John Siirola"

from pyomo.core.expr import current as EXPR, native_types
from pyomo.core import expr as EXPR, native_types
from pyomo.core.expr.numvalue import value

_numpy_available = True
Expand Down
2 changes: 1 addition & 1 deletion idaes/core/util/expr_doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from pyomo.core.base.block import _BlockData
from pyomo.core.expr.visitor import StreamBasedExpressionVisitor
from pyomo.core.expr.numeric_expr import ExternalFunctionExpression
from pyomo.core.expr import current as EXPR, native_types
from pyomo.core import expr as EXPR, native_types
from pyomo.common.collections import ComponentMap


Expand Down
2 changes: 1 addition & 1 deletion idaes/core/util/scaling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
from pyomo.dae import DerivativeVar
from pyomo.dae.flatten import slice_component_along_sets
from pyomo.util.calc_var_value import calculate_variable_from_constraint
from pyomo.core.expr import current as EXPR
from pyomo.core import expr as EXPR
from pyomo.core.expr.numvalue import native_types, pyomo_constant_types
from pyomo.core.base.units_container import _PyomoUnit

Expand Down
Loading