Merge branch 'main' into fs_nested_dyn_fix

IDAES · Dec 12, 2024 · 6d87534 · 6d87534
2 parents aae6730 + 327d8f3
commit 6d87534
Show file tree

Hide file tree

Showing 42 changed files with 1,381 additions and 305 deletions.
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -109,6 +109,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ matrix.python-version }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:
@@ -167,6 +168,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:
@@ -201,6 +203,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:
@@ -233,6 +236,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -149,6 +149,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ matrix.python-version }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:
@@ -186,6 +187,7 @@ jobs:
         with:
           activate-environment: ${{ env.IDAES_CONDA_ENV_NAME_DEV }}
           python-version: ${{ matrix.python-version }}
+          miniforge-version: latest
       - name: Set up idaes
         uses: ./.github/actions/setup-idaes
         with:
@@ -239,13 +241,14 @@ jobs:
         with:
           activate-environment: idaes-env
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
+          miniforge-version: latest
       - name: Set up idaes (non-editable installation)
         uses: ./.github/actions/setup-idaes
         with:
           install-target: ${{ matrix.pip-install-target }}
       - name: Remove dependencies installable with pip but not with conda
         # NOTE some dependencies that are installed by default with pip are not available through conda
-        # so they're not installed if IDAES is installed with `conda -c conda-forge -c IDAES-PSE idaes-pse`
+        # so they're not installed if IDAES is installed with `conda -c conda-forge idaes-pse`
         # to ensure this scenario is handled properly, since we don't have (yet) the conda-build process integrated with the CI,
         # we manually remove the "pip-but-not-conda" dependencies after installing with pip
         # as an approximation of the enviroment that we'd get from `conda install`

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ scale-up, operation and troubleshooting of innovative, advanced energy systems.
 
 Our [complete documentation is online](https://idaes-pse.readthedocs.io/en/stable/) but here is a summarized set of steps to get started using the framework. For help and assistance, please visit the [IDAES PSE Discussions Board](https://github.com/IDAES/idaes-pse/discussions).
 
-While not required, we encourage the installation of [Anaconda](https://www.anaconda.com/products/individual#Downloads) or [Miniconda](https://docs.conda.io/en/latest/miniconda.html) and using the `conda` command to create a separate python environment in which to install the IDAES Toolkit.
+While not required, we encourage the installation of [Miniforge](https://conda-forge.org/miniforge/) with which you can use the `conda` command to create a separate python environment in which to install the IDAES Toolkit.
 
 Use conda to create a new "idaes-pse" (could be any name you like) environment then activate that environment:
 ```bash

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/build.py b/docs/build.py
@@ -213,8 +213,8 @@ def main() -> int:
         "-t",
         "--timeout",
         dest="timeout",
-        help="Timeout (in seconds) for sphinx-build (default=180)",
-        default=180,
+        help="Timeout (in seconds) for sphinx-build (default=360)",
+        default=360,
         type=int,
     )
     prs.add_argument(

diff --git a/docs/reference_guides/developer/devsw.rst b/docs/reference_guides/developer/devsw.rst
@@ -145,18 +145,18 @@ Once you have the repo cloned, you can change into that directory (by default, i
 will be called "idaes-dev" like the repo) and install the Python packages.
 
 But before you do that, you need to get the Python package manager fully up and
-running. We use a Python packaging system called Conda_.
-Below are instructions for installing a minimal version of Conda, called Miniconda_.
+running. We use a Python packaging system called Miniforge_.
+Below are the instructions for installing the package manager -- which is a community driven and minimal version of Conda.
 The full version installs a large number of scientific analysis and visualization libraries
 that are not required by the IDAES framework.
 
 .. _Conda: https://conda.io/
-.. _Miniconda: https://conda.io/en/latest/miniconda.html
+.. _Miniforge: https://conda-forge.org/miniforge/
 
 .. code-block:: sh
 
-    wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh
-    bash Miniconda3-latest-Linux-x86_64.sh
+    wget https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh
+    bash Miniforge3-Linux-x86_64.sh
 
 Create and activate a conda environment (along with its own copy of ``pip``)
 for the new IDAES installation **(you will need to** ``conda activate idaes``

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/docs/reference_guides/model_libraries/generic/unit_models/index.rst b/docs/reference_guides/model_libraries/generic/unit_models/index.rst
@@ -27,6 +27,7 @@ Unit Models
     skeleton_unit
     statejunction
     stoichiometric_reactor
+    stream_scaler
     translator
     turbine
     valve