Skip to content

Commit

Permalink
Merge pull request #5 from MichaelPesce/remove-idaes-dependency
Browse files Browse the repository at this point in the history
Remove idaes dependency
  • Loading branch information
MichaelPesce authored Nov 11, 2024
2 parents 0f4d006 + b9154fd commit 9ea098c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ jobs:
name: Install (standard)
run: |
pip install "git+${{ format('{0}/{1}@{2}', github.server_url, github.repository, github.ref) }}"
- name: Install (idaes-solvers)
- if: matrix.install-mode == 'dev'
name: Install (idaes-solvers)
run: |
idaes get-extensions
- if: matrix.coverage
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ dynamic = ["version"]
dependencies = [
"pydantic >= 2, <3",
"pyomo",
"idaes-pse",
]
[project.optional-dependencies]
testing = [
"pytest >= 8",
"idaes-pse",
# watertap.flowsheets currently required to be able to run tests
"watertap==1.1.0rc0",
]
Expand Down
5 changes: 2 additions & 3 deletions src/idaes_flowsheet_processor/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@
import importlib_metadata as metadata

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

Expand All @@ -48,7 +47,7 @@
FSI = TypeVar("FSI", bound="FlowsheetInterface")


_log = idaeslog.getLogger(__name__)
_log = logging.getLogger(__name__)


class UnsupportedObjType(TypeError):
Expand Down

0 comments on commit 9ea098c

Please sign in to comment.