From 0deb5937dabe35c9dcbe90d840e605751873d5ae Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 18 Oct 2024 09:39:32 -0400 Subject: [PATCH 1/5] Update code owners --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 64df5fac28..e4a2f76e03 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -23,13 +23,13 @@ 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 # Apps - each package needs a maintainer /idaes/apps/caprese/ @Robbybp From 63537d82ea6decbc236f649a553b70cb4206b894 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 18 Oct 2024 09:50:42 -0400 Subject: [PATCH 2/5] Trying xfail PHE tests only on Windows --- .../column_models/tests/test_plate_heat_exchanger.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py index cd08ffbb67..6ecf541dd9 100644 --- a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py +++ b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py @@ -14,8 +14,9 @@ Tests for Plate Heat Exchnager unit model. Author: Akula Paul """ - +import sys import pytest + from pyomo.environ import ( check_optimal_termination, ConcreteModel, @@ -23,6 +24,8 @@ units as pyunits, value, ) +from pyomo.util.check_units import assert_units_consistent, assert_units_equivalent + from idaes.core import FlowsheetBlock from idaes.models_extra.column_models.plate_heat_exchanger import ( PlateHeatExchanger as PHE, @@ -37,7 +40,6 @@ from idaes.core.util.model_statistics import degrees_of_freedom from idaes.core.util.testing import initialization_tester from idaes.core.solvers import get_solver -from pyomo.util.check_units import assert_units_consistent, assert_units_equivalent # ----------------------------------------------------------------------------- @@ -66,8 +68,10 @@ def test_config(): workaround_for_1294 = pytest.mark.xfail( + sys.platform + == "win32", # the failures only occur for Windows on GHA with Python <3.12 reason="These tests fail with Pyomo 6.7.0. See IDAES/idaes-pse#1294 for details", - strict=False, # the failures only occur for certain platforms, e.g. Windows on GHA + strict=False, ) From 9fc8b7afa7d4c4133137aad08c0b1ed70b21b3c1 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 18 Oct 2024 13:50:29 -0400 Subject: [PATCH 3/5] Revert change on xfailed tests for PHE --- .../column_models/tests/test_plate_heat_exchanger.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py index 6ecf541dd9..795ed4a86e 100644 --- a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py +++ b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py @@ -68,8 +68,7 @@ def test_config(): workaround_for_1294 = pytest.mark.xfail( - sys.platform - == "win32", # the failures only occur for Windows on GHA with Python <3.12 + # the failures only occur for Windows on GHA with Python <3.12, and Linux with Python 3.12 reason="These tests fail with Pyomo 6.7.0. See IDAES/idaes-pse#1294 for details", strict=False, ) From b11fce544152d406a16cdb5c1afce2932357b53d Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 24 Oct 2024 14:15:17 -0400 Subject: [PATCH 4/5] Update .github/CODEOWNERS --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e4a2f76e03..8bd70f352f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -30,6 +30,7 @@ conftest.py @lbianchi-lbl # Models /idaes/models/ @agarciadiego @bpaul4 +/idaes/models/properties/ @agarciadiego @dallan-keylogic # Apps - each package needs a maintainer /idaes/apps/caprese/ @Robbybp From 04dabcc214a1d0de9ebfdfadf7ea3f631410f0b1 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 24 Oct 2024 14:41:23 -0400 Subject: [PATCH 5/5] Update idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py --- .../column_models/tests/test_plate_heat_exchanger.py | 1 - 1 file changed, 1 deletion(-) diff --git a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py index 795ed4a86e..4b305a1630 100644 --- a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py +++ b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py @@ -14,7 +14,6 @@ Tests for Plate Heat Exchnager unit model. Author: Akula Paul """ -import sys import pytest from pyomo.environ import (