Merge branch 'main' into add_gray_box_do_counting

IDAES · Nov 21, 2024 · 2cd193a · 2cd193a
2 parents d9ff557 + b0f9156
commit 2cd193a
Show file tree

Hide file tree

Showing 26 changed files with 2,916 additions and 427 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ scale-up, operation and troubleshooting of innovative, advanced energy systems.
 [![GitHub contributors](https://img.shields.io/github/contributors/IDAES/idaes-pse.svg)](https://github.com/IDAES/idaes-pse/graphs/contributors)
 [![Merged PRs](https://img.shields.io/github/issues-pr-closed-raw/IDAES/idaes-pse.svg?label=merged+PRs)](https://github.com/IDAES/idaes-pse/pulls?q=is:pr+is:merged)
 [![Issue stats](http://isitmaintained.com/badge/resolution/IDAES/idaes-pse.svg)](http://isitmaintained.com/project/IDAES/idaes-pse)
-[![Downloads](https://pepy.tech/badge/idaes-pse)](https://pepy.tech/project/idaes-pse)
+[![Downloads](https://static.pepy.tech/badge/idaes-pse)](https://pepy.tech/project/idaes-pse)
 <!-- END Status badges -->
 
 ## Getting Started

diff --git a/docker/README.md b/docker/README.md
diff --git a/docker/idaes-jupyterhub/Dockerfile b/docker/idaes-jupyterhub/Dockerfile
diff --git a/docker/idaes-jupyterhub/README.md b/docker/idaes-jupyterhub/README.md
diff --git a/docker/ubuntu-conda/Dockerfile b/docker/ubuntu-conda/Dockerfile
diff --git a/docker/ubuntu-conda/README-build.md b/docker/ubuntu-conda/README-build.md
diff --git a/docker/ubuntu-conda/README.md b/docker/ubuntu-conda/README.md
diff --git a/docs/reference_guides/model_libraries/generic/property_models/ceos.rst b/docs/reference_guides/model_libraries/generic/property_models/ceos.rst
@@ -1,6 +1,9 @@
 Cubic Equations of State
 ========================
 
+.. deprecated:: 2.7
+   Use :class:`idaes.models.properties.modular_properties.eos.ceos` in the Modular Property Framework instead.
+
 This property package implements a general form of a cubic equation of state which can be used for most cubic-type equations of state. This package supports phase equilibrium calculations with a smooth phase transition formulation that makes it amenable for equation oriented optimization. The following equations of state are currently supported:
 
 * Peng-Robinson

diff --git a/idaes/core/scaling/custom_scaler_base.py b/idaes/core/scaling/custom_scaler_base.py
@@ -16,7 +16,6 @@
 Author: Andrew Lee
 """
 from copy import copy
-from enum import Enum
 
 from pyomo.environ import ComponentMap, units, value
 from pyomo.core.base.units_container import UnitsError
@@ -26,6 +25,7 @@
 from idaes.core.scaling.scaling_base import CONFIG, ScalerBase
 from idaes.core.scaling.util import get_scaling_factor, NominalValueExtractionVisitor
 import idaes.logger as idaeslog
+from idaes.core.util.misc import StrEnum
 
 # Set up logger
 _log = idaeslog.getLogger(__name__)
@@ -41,7 +41,7 @@
 }
 
 
-class ConstraintScalingScheme(str, Enum):
+class ConstraintScalingScheme(StrEnum):
     """
     Schemes available for calculating constraint scaling factors.