Skip to content

Renaming components #1402

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
Merged
andrewlee94 merged 10 commits into from
May 8, 2024
Merged

Renaming components #1402

andrewlee94 merged 10 commits into from
May 8, 2024

Conversation

@andrewlee94
Copy link
Contributor

@andrewlee94 andrewlee94 commented May 3, 2024 •
edited
Loading

Related to Pyomo/pyomo#3221

Requires a fix in Pyomo and/or OMLT to address exception due to sub-classing metaclass. Will also require the Pyomo dependency to be updated.

Summary/Motivation:

This PR updates IDAES to use the new public names for Pyomo component data classes.

Changes proposed in this PR:

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.txt file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@andrewlee94 andrewlee94 self-assigned this May 3, 2024
@andrewlee94 andrewlee94 added Priority:High High Priority Issue or PR dependencies Pull requests that update a dependency file pyomo deprecation Add deprecation to codebase and/or remove deprecated feature labels May 3, 2024
@andrewlee94 andrewlee94 requested review from blnicho and jsiirola May 3, 2024 16:25
dallan-keylogic
dallan-keylogic approved these changes May 3, 2024
View reviewed changes
Copy link
Contributor

@dallan-keylogic dallan-keylogic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

bpaul4
bpaul4 approved these changes May 6, 2024
View reviewed changes
Copy link
Contributor

@bpaul4 bpaul4 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, pending the tests passing once the branch is updated.

@codecov-commenter
Copy link

codecov-commenter commented May 7, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 78.57143% with 15 lines in your changes are missing coverage. Please review.

Project coverage is 77.88%. Comparing base (6fe724a) to head (d5ae666).

Files Patch % Lines
idaes/core/util/expr_doc.py 50.00% 3 Missing ⚠️
idaes/core/util/model_diagnostics.py 78.57% 0 Missing and 3 partials ⚠️
idaes/apps/caprese/common/config.py 33.33% 2 Missing ⚠️
idaes/core/util/scaling.py 71.42% 0 Missing and 2 partials ⚠️
idaes/apps/caprese/dynamic_block.py 75.00% 1 Missing ⚠️
idaes/apps/caprese/util.py 75.00% 0 Missing and 1 partial ⚠️
idaes/core/base/property_base.py 75.00% 0 Missing and 1 partial ⚠️
idaes/core/base/var_like_expression.py 83.33% 1 Missing ⚠️
idaes/core/util/tables.py 50.00% 0 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #1402      +/-   ##
==========================================
- Coverage   77.89%   77.88%   -0.01%     
==========================================
  Files         394      394              
  Lines       65061    65053       -8     
  Branches    14383    14383              
==========================================
- Hits        50678    50667      -11     
- Misses      11793    11797       +4     
+ Partials     2590     2589       -1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@andrewlee94 andrewlee94 requested a review from dangunter as a code owner May 7, 2024 17:41
@andrewlee94 andrewlee94 enabled auto-merge (squash) May 7, 2024 20:06
@andrewlee94 andrewlee94 disabled auto-merge May 8, 2024 17:12
@andrewlee94 andrewlee94 merged commit 97d2f05 into IDAES:main May 8, 2024
@andrewlee94 andrewlee94 deleted the renaming_components branch May 8, 2024 17:12
This was referenced May 9, 2024
Merged
Closed
@lbianchi-lbl lbianchi-lbl mentioned this pull request May 31, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@bpaul4 bpaul4 bpaul4 approved these changes

@dallan-keylogic dallan-keylogic dallan-keylogic approved these changes

@Robbybp Robbybp Awaiting requested review from Robbybp Robbybp is a code owner

@rundxdi rundxdi Awaiting requested review from rundxdi rundxdi is a code owner

@lbianchi-lbl lbianchi-lbl Awaiting requested review from lbianchi-lbl

@ksbeattie ksbeattie Awaiting requested review from ksbeattie ksbeattie is a code owner

@jsiirola jsiirola Awaiting requested review from jsiirola

@blnicho blnicho Awaiting requested review from blnicho

@dangunter dangunter Awaiting requested review from dangunter dangunter is a code owner

@MAZamarripa MAZamarripa Awaiting requested review from MAZamarripa MAZamarripa is a code owner

@AlexNoring AlexNoring Awaiting requested review from AlexNoring AlexNoring is a code owner

Assignees

@andrewlee94 andrewlee94

Labels

dependencies Pull requests that update a dependency file deprecation Add deprecation to codebase and/or remove deprecated feature Priority:High High Priority Issue or PR pyomo

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@andrewlee94 @codecov-commenter @bpaul4 @dallan-keylogic