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.

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

Update idaes-pse requirement for current dev version to latest tag on watertap-org fork #289

Merged
merged 5 commits into from
Jan 7, 2022

Conversation

lbianchi-lbl
Copy link
Contributor

@lbianchi-lbl lbianchi-lbl commented Jan 6, 2022

Summary/Motivation:

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.

@codecov-commenter
Copy link

codecov-commenter commented Jan 6, 2022

Codecov Report

Merging #289 (db0b369) into main (d51b982) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #289   +/-   ##
=======================================
  Coverage   89.81%   89.81%           
=======================================
  Files          79       79           
  Lines        8362     8362           
=======================================
  Hits         7510     7510           
  Misses        852      852           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d51b982...db0b369. Read the comment docs.

@bknueven
Copy link
Contributor

bknueven commented Jan 6, 2022

@lbianchi-lbl the new tag points to the same IDAES commit as the old tag: watertap-org/idaes-pse@2021d13.

Copy link
Collaborator

@aladshaw3 aladshaw3 left a comment

Choose a reason for hiding this comment

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

There are no issues/failures currently, so I am gonna approve this. Not sure what the expected errors were, but they didn't occur, so it may have been fixed with some of the recent PRs that got merged earlier today.

@lbianchi-lbl
Copy link
Contributor Author

@bknueven You're absolutely right, thanks for catching that. I must have done the tag creation and pull in the wrong order. I'll recreate the tag and re-run the tests again.

@aladshaw3 aladshaw3 self-requested a review January 6, 2022 22:42
@aladshaw3
Copy link
Collaborator

aladshaw3 commented Jan 6, 2022

Revoking my approval due to a test failure after updated tag.

@adam-a-a @TimBartholomew The failure is in the NaCl and Seawater prop packages.

So far, none of the chem tests have failed that I can see.

Copy link
Collaborator

@aladshaw3 aladshaw3 left a comment

Choose a reason for hiding this comment

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

NaCl and Seawater Prop Packages are failing

===========================
FAILED watertap/property_models/tests/test_NaCl_prop_pack.py::TestNaClProperty_idaes::test_initialize_failure
FAILED watertap/property_models/tests/test_seawater_prop_pack.py::TestSeawaterProperty_idaes::test_initialize_failure

@AndrewLee
Copy link

AndrewLee commented Jan 7, 2022 via email

@andrewlee94
Copy link
Collaborator

The failures in the NaCl and seawater property package are the ones I was expecting to see - I will fix these today,

@lbianchi-lbl lbianchi-lbl enabled auto-merge (squash) January 7, 2022 16:09
@lbianchi-lbl
Copy link
Contributor Author

@aladshaw3 this should auto-merge as soon as the requested changes in your review are marked as addressed:

image

@lbianchi-lbl lbianchi-lbl merged commit e1641cb into watertap-org:main Jan 7, 2022
@ksbeattie ksbeattie added the Priority:High High Priority Issue or PR label Jan 13, 2022
lbianchi-lbl added a commit that referenced this pull request Jan 22, 2022
… watertap-org fork (#289)

* Update idaes-pse requirement to latest tag

* Adding InitializationErrors to watertap propery packages

* Fixing issue with initialization errors when solve wa skipped

Co-authored-by: Austin Ladshaw <ladshawap@ornl.gov>
Co-authored-by: Andrew Lee <andrew.lee@netl.doe.gov>
(cherry picked from commit e1641cb)
@lbianchi-lbl lbianchi-lbl deleted the update-idaes-tag branch February 1, 2022 00:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Priority:High High Priority Issue or PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants