Merge remote-tracking branch 'upstream/main' into popos_getextensions

.coveragerc

@@ -7,8 +7,6 @@ omit =
     /opt/*
     # skip test directories
     */tests/*
-    # skip DMF's CLI
-    idaes/dmf/commands.py
     # skip plugins
     *_plugin.py
 

.github/CODEOWNERS

@@ -9,6 +9,8 @@ requirements*.txt @lbianchi-lbl @ksbeattie
 
 # CI infra
 .github/ @lbianchi-lbl @ksbeattie 
+# spellchecker configuration
+.github/workflows/typos.toml @bpaul4 @lbianchi-lbl
 
 # testing
 pytest*.ini @lbianchi-lbl
@@ -21,13 +23,14 @@ conftest.py @lbianchi-lbl
 /idaes/commands/ @dangunter
 
 # Core
-/idaes/core/ @andrewlee94 @dallan-keylogic @lbianchi-lbl
+/idaes/core/ @agarciadiego @dallan-keylogic @lbianchi-lbl
 /idaes/core/dmf/ @dangunter
-/idaes/core/surrogate/ @andrewlee94 @bpaul4 @avdudchenko @rundxdi
+/idaes/core/surrogate/ @bpaul4 @avdudchenko @rundxdi
 /idaes/core/ui/ @dangunter
 
 # Models
-/idaes/models/ @andrewlee94 @bpaul4
+/idaes/models/ @agarciadiego @bpaul4
+/idaes/models/properties/ @agarciadiego @dallan-keylogic 
 
 # Apps - each package needs a maintainer
 /idaes/apps/caprese/ @Robbybp

.github/actions/run-examples/examples_for_idaes_ci.py

@@ -28,24 +28,13 @@ def _matches_pattern(item: pytest.Item, pattern: str) -> bool:
 
 
 def pytest_configure(config: pytest.Config):
-    tensorflow_py311_win = pytest.mark.xfail(
-        condition=sys.version_info > (3, 11),
-        run=True,
-        strict=False,
-        reason="tensorflow ImportError on 3.11+ on Windows (cannot import name 'formatargspec' from 'inspect')",
-    )
     config.stash[matchmarker] = {
         "*/held/*": pytest.mark.xfail(run=False, reason="notebook has 'held' status"),
         "*/archive/*": pytest.mark.skip(reason="notebook is archived"),
-        # TODO: Need to fix this once the Python 3.11 issue is resolved in tensorflow
-        "*/surrogates/best_practices_optimization*": tensorflow_py311_win,
-        "*/surrogates/omlt/keras_flowsheet_optimization*": tensorflow_py311_win,
         "*/surrogates/sco2/alamo/*": pytest.mark.xfail(
             run=False,
             reason="notebooks require ALAMO to run",
         ),
-        "*/surrogates/sco2/omlt/keras_training*": tensorflow_py311_win,
-        "*/surrogates/sco2/omlt/flowsheet_optimization*": tensorflow_py311_win,
     }
     config.stash[marked] = []
 

.github/workflows/core.yml

@@ -76,7 +76,7 @@ jobs:
       - name: Checkout source
         uses: actions/checkout@v4
       - name: Run Spell Checker
-        uses: crate-ci/typos@master
+        uses: crate-ci/typos@v1.24.5
         with: 
           config: ./.github/workflows/typos.toml
 
@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         os:
           - linux
           - win64
@@ -152,6 +152,9 @@ jobs:
           # but does require token for other workflows e.g. merge to `main`
           # see https://github.com/codecov/codecov-action/issues/1274#issuecomment-1934437359
           token: ${{ secrets.CODECOV_TOKEN }}
+          # pinning version after v0.7.0 broke tokenless upload
+          # see codecov/codecov-action#1487
+          version: v0.7.1
 
   build-docs:
     name: Build Sphinx docs
@@ -222,7 +225,7 @@ jobs:
 
   compat:
     name: Compatibility tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - name: Set up Conda environment

.github/workflows/integration.yml

@@ -132,7 +132,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         os:
           - linux
           - win64
@@ -169,7 +169,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
         os:
           - linux
           - win64
@@ -226,9 +226,9 @@ jobs:
           - install-mode: pip-default
             pip-install-target: '.'
           - install-mode: pip-complete
-            pip-install-target: .[ui,dmf,grid]
+            pip-install-target: .[ui,grid]
           - install-mode: pip-all
-            pip-install-target: .[ui,dmf,grid,omlt,coolprop]
+            pip-install-target: .[ui,grid,omlt,coolprop]
           - install-mode: conda-like
             pip-install-target: '.'
             dependencies-to-uninstall: omlt

.github/workflows/typos.toml

@@ -8,6 +8,7 @@ idaes = "idaes"
 IDAE = "IDAE"
 # HELMET - HELMholtz
 HEL = "HEL"
+gam = "gam"
 # Datas
 Datas = "Datas"
 # ba triggers in docs
@@ -39,8 +40,6 @@ delt = "delt"
 # Minimal Infeasible System
 mis = "mis"
 MIS = "MIS"
-# TEMPORARY - Remove after example update
-upadate = "upadate"
 
 # false positive from 1.20.3
 RTO = "RTO"

.gitignore

@@ -125,8 +125,6 @@ venv.bak/
 # VSCode
 .vscode/
 
-# File generated by DMF
-config.yaml
 # Documentation
 docs/sphinx-errors.txt
 docs/apidoc/

COPYRIGHT.md

@@ -3,7 +3,7 @@ Copyright
 
 Institute for the Design of Advanced Energy Systems Process Systems Engineering
 Framework (IDAES PSE Framework) was produced under the DOE Institute for the
-Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2023 by the
+Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2024 by the
 software owners: The Regents of the University of California, through Lawrence
 Berkeley National Laboratory,  National Technology & Engineering Solutions of
 Sandia, LLC, Carnegie Mellon University, West Virginia University Research
@@ -15,4 +15,4 @@ U.S. Government has been granted for itself and others acting on its behalf a
 paid-up, nonexclusive, irrevocable, worldwide license in the Software to
 reproduce, distribute copies to the public, prepare derivative works, and
 perform publicly and display publicly, and to permit other to do so. Copyright
-(C) 2018-2023 IDAES - All Rights Reserved
+(C) 2018-2024 IDAES - All Rights Reserved

LICENSE.md

@@ -2,7 +2,7 @@ License
 =======
 
 Institute for the Design of Advanced Energy Systems Process Systems Engineering
-Framework (IDAES PSE Framework) Copyright (c) 2018-2023, by the software owners: The
+Framework (IDAES PSE Framework) Copyright (c) 2018-2024, by the software owners: The
 Regents of the University of California, through Lawrence Berkeley National
 Laboratory,  National Technology & Engineering Solutions of Sandia, LLC,
 Carnegie Mellon University, West Virginia University Research Corporation, et al.

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
@@ -37,7 +37,7 @@ pip install idaes-pse
 # install latest stable release with one set of optional dependencies, e.g. `ui` for the user interface
 pip install "idaes-pse[ui]"
 # install latest stable release with multiple sets of optional dependencies
-pip install "idaes-pse[ui,dmf,omlt,grid,coolprop]"
+pip install "idaes-pse[ui,omlt,grid,coolprop]"
 # install latest version from the main branch of this repository
 pip install "idaes-pse @ git+https://github.com/IDAES/idaes-pse@main"
 # install from the `mybranch` branch of the fork belonging to `myuser`
@@ -82,12 +82,14 @@ Most of the functionality is implemented in Python. In accordance with
 the end-of-life for many Python 2 libraries, the IDAES Toolkit is written
 for Python 3. The following sub-versions are supported:
 
-* Python 3.8
 * Python 3.9
 * Python 3.10
 * Python 3.11
 * Python 3.12
 
+> [!IMPORTANT]
+> Note that Python 3.8 is no longer officially supported.
+
 ## Contacts and more information
 
 General, background and overview information is available at the [IDAES main website](https://www.idaes.org).