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

Migrate watertap.ui.fsapi to idaes_flowsheet_processor #1518

Merged
merged 11 commits into from
Nov 26, 2024

Conversation

lbianchi-lbl
Copy link
Contributor

@lbianchi-lbl lbianchi-lbl commented Nov 6, 2024

Resolve: #1517

Changes proposed in this PR:

  • Remove code in watertap/ui
  • Update imports: watertap.ui.fsapi -> idaes_flowsheet_processor.api (we might want to just use the top-level package instead; see watertap-org/idaes-flowsheet-processor#FIXME)
  • Add idaes-flowsheet-processor (currently from the repo URL https://github.com/watertap-org/idaes-flowsheet-processor) as an optional dependency under the testing target
  • Refactor optional dependencies by removing the dev target and splitting its contents between the testing target and requirements-dev.txt

Before merging

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.

@lbianchi-lbl lbianchi-lbl self-assigned this Nov 6, 2024
lbianchi-lbl added a commit to lbianchi-lbl/idaes-flowsheet-processor that referenced this pull request Nov 21, 2024
lbianchi-lbl added a commit to watertap-org/idaes-flowsheet-processor that referenced this pull request Nov 26, 2024
#6)

* Add initial implementation of pytest plugin

* Add README with usage examples and basic tests

* Add previously missing import

* Temporarily set watertap requirement to use watertap-org/watertap#1518

* Add missing __init__.py file

* Handle typing limitations on Python 3.9

* Ensure Git history is available to calculate version correctly

* Avoid replacing collection of ordinary Python tests

* Add nodeid to improve display when running in non-verbose mode

* Ensure entry points are unique
Copy link
Contributor

@MarcusHolly MarcusHolly left a comment

Choose a reason for hiding this comment

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

LGTM - it seems like this shouldn't change how we run the GUI locally, right? I just tried running the BSM2 GUI off this branch and didn't run into any issues

@lbianchi-lbl
Copy link
Contributor Author

LGTM - it seems like this shouldn't change how we run the GUI locally, right? I just tried running the BSM2 GUI off this branch and didn't run into any issues

This is an excellent point @MarcusHolly. I've added a section to the documentation (commit 666e935) to explain how to run tests for the flowsheet interfaces. Feel free to take a look and let me know if you have any feedback or suggestions.

@lbianchi-lbl lbianchi-lbl enabled auto-merge (squash) November 26, 2024 18:31
@lbianchi-lbl lbianchi-lbl merged commit 68dc32c into watertap-org:main Nov 26, 2024
19 checks passed
lbianchi-lbl added a commit to watertap-org/idaes-flowsheet-processor that referenced this pull request Nov 26, 2024
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.

Migrate watertap.ui.fsapi to idaes-flowsheet-processor
3 participants