Skip to content

Commit 9ea098c

Browse files
authored
Merge pull request #5 from MichaelPesce/remove-idaes-dependency
Remove idaes dependency
2 parents 0f4d006 + b9154fd commit 9ea098c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/checks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ jobs:
8484
name: Install (standard)
8585
run: |
8686
pip install "git+${{ format('{0}/{1}@{2}', github.server_url, github.repository, github.ref) }}"
87-
- name: Install (idaes-solvers)
87+
- if: matrix.install-mode == 'dev'
88+
name: Install (idaes-solvers)
8889
run: |
8990
idaes get-extensions
9091
- if: matrix.coverage

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ dynamic = ["version"]
1212
dependencies = [
1313
"pydantic >= 2, <3",
1414
"pyomo",
15-
"idaes-pse",
1615
]
1716
[project.optional-dependencies]
1817
testing = [
1918
"pytest >= 8",
19+
"idaes-pse",
2020
# watertap.flowsheets currently required to be able to run tests
2121
"watertap==1.1.0rc0",
2222
]

src/idaes_flowsheet_processor/api.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
import importlib_metadata as metadata
3939

4040
# third-party
41-
import idaes.logger as idaeslog
42-
from idaes.core.util.model_statistics import degrees_of_freedom
41+
from pyomo.contrib.viewer.report import degrees_of_freedom
4342
from pydantic import BaseModel, Field, field_validator, ValidationInfo, ConfigDict
4443
import pyomo.environ as pyo
4544

@@ -48,7 +47,7 @@
4847
FSI = TypeVar("FSI", bound="FlowsheetInterface")
4948

5049

51-
_log = idaeslog.getLogger(__name__)
50+
_log = logging.getLogger(__name__)
5251

5352

5453
class UnsupportedObjType(TypeError):

0 commit comments

Comments
 (0)