Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Address minor issues identified in 10/24 Code Audit #1504

Merged
merged 8 commits into from
Oct 28, 2024
Merged

Address minor issues identified in 10/24 Code Audit #1504

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0deb593
Update code owners
andrewlee94 Oct 18, 2024
63537d8
Trying xfail PHE tests only on Windows
andrewlee94 Oct 18, 2024
0587e47
Merge branch 'main' into audit_10_24
andrewlee94 Oct 18, 2024
9fc8b7a
Revert change on xfailed tests for PHE
andrewlee94 Oct 18, 2024
7500638
Merge branch 'main' into audit_10_24
andrewlee94 Oct 19, 2024
b11fce5
Update .github/CODEOWNERS
andrewlee94 Oct 24, 2024
04dabcc
Update idaes/models_extra/column_models/tests/test_plate_heat_exchang…
andrewlee94 Oct 24, 2024
a5574f1
Merge branch 'main' into audit_10_24
andrewlee94 Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -23,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
dallan-keylogic marked this conversation as resolved.
Show resolved Hide resolved
andrewlee94 marked this conversation as resolved.
Show resolved Hide resolved
/idaes/models/properties/ @agarciadiego @dallan-keylogic

# Apps - each package needs a maintainer
/idaes/apps/caprese/ @Robbybp
Expand Down
9 changes: 6 additions & 3 deletions idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@
Tests for Plate Heat Exchnager unit model.
Author: Akula Paul
"""

import sys
andrewlee94 marked this conversation as resolved.
Show resolved Hide resolved
import pytest

from pyomo.environ import (
check_optimal_termination,
ConcreteModel,
Param,
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,
Expand All @@ -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


# -----------------------------------------------------------------------------
Expand Down Expand Up @@ -66,8 +68,9 @@ def test_config():


workaround_for_1294 = pytest.mark.xfail(
# 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, # the failures only occur for certain platforms, e.g. Windows on GHA
strict=False,
)


Expand Down
Loading