From db5fdf02d7e876ae3bd690ab85c032ebf9b46d26 Mon Sep 17 00:00:00 2001 From: Miranda Mundt Date: Fri, 16 Feb 2024 14:53:59 -0700 Subject: [PATCH] Fix import; apply black --- pyomo/core/expr/numvalue.py | 1 + pyomo/core/util.py | 5 +---- pyomo/opt/results/container.py | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pyomo/core/expr/numvalue.py b/pyomo/core/expr/numvalue.py index f3ea76c305c..3a4359af2f9 100644 --- a/pyomo/core/expr/numvalue.py +++ b/pyomo/core/expr/numvalue.py @@ -32,6 +32,7 @@ check_if_numeric_type, value, ) +from pyomo.core.pyomoobject import PyomoObject relocated_module_attribute( 'native_boolean_types', diff --git a/pyomo/core/util.py b/pyomo/core/util.py index e4a70aea05a..f337b487cef 100644 --- a/pyomo/core/util.py +++ b/pyomo/core/util.py @@ -15,10 +15,7 @@ from pyomo.common.deprecation import deprecation_warning from pyomo.core.expr.numvalue import native_numeric_types -from pyomo.core.expr.numeric_expr import ( - mutable_expression, - NPV_SumExpression, -) +from pyomo.core.expr.numeric_expr import mutable_expression, NPV_SumExpression from pyomo.core.base.var import Var from pyomo.core.base.expression import Expression from pyomo.core.base.component import _ComponentBase diff --git a/pyomo/opt/results/container.py b/pyomo/opt/results/container.py index ec4cb3c1c53..4bbaf44edf7 100644 --- a/pyomo/opt/results/container.py +++ b/pyomo/opt/results/container.py @@ -16,6 +16,7 @@ from pyomo.common.collections import Bunch + class ScalarType(str, enum.Enum): int = 'int' time = 'time'