Skip to content

Comments

Running black on the entire repo#894

Merged
lbianchi-lbl merged 4 commits intoIDAES:mainfrom
ksbeattie:black
Jun 30, 2022
Merged

Running black on the entire repo#894
lbianchi-lbl merged 4 commits intoIDAES:mainfrom
ksbeattie:black

Conversation

@ksbeattie
Copy link
Member

Fixes

The desire to have a common, enforced coding style.

Summary/Motivation:

This is the result of running black . at the top of the repo

Changes proposed in this PR:

  • black attack!

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.

@ksbeattie ksbeattie added the Priority:High High Priority Issue or PR label Jun 16, 2022
@ksbeattie ksbeattie self-assigned this Jun 16, 2022
@ksbeattie ksbeattie requested a review from lbianchi-lbl June 16, 2022 19:30
@ksbeattie
Copy link
Member Author

This still needs the GHA hooks to enforce this.

@codecov
Copy link

codecov bot commented Jun 16, 2022

Codecov Report

Merging #894 (2141c4b) into main (cccb331) will decrease coverage by 0.23%.
The diff coverage is 68.11%.

@@            Coverage Diff             @@
##             main     #894      +/-   ##
==========================================
- Coverage   69.50%   69.27%   -0.24%     
==========================================
  Files         578      498      -80     
  Lines       64859    64322     -537     
  Branches    12064    12038      -26     
==========================================
- Hits        45080    44558     -522     
+ Misses      17508    17505       -3     
+ Partials     2271     2259      -12     
Impacted Files Coverage Δ
idaes/apps/caprese/common/config.py 67.44% <0.00%> (ø)
idaes/apps/grid_integration/utils.py 100.00% <ø> (ø)
idaes/apps/matopt/opt/mat_modeling.py 41.80% <ø> (ø)
idaes/apps/nmpc/cost_expressions.py 100.00% <ø> (ø)
idaes/commands/__init__.py 100.00% <ø> (ø)
idaes/commands/base.py 40.00% <0.00%> (ø)
idaes/commands/data_directory.py 53.84% <ø> (ø)
idaes/core/dmf/cli.py 65.38% <ø> (ø)
idaes/core/dmf/commands.py 19.20% <ø> (ø)
idaes/core/dmf/resource.py 71.80% <0.00%> (ø)
... and 250 more

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 cccb331...2141c4b. Read the comment docs.

@ksbeattie
Copy link
Member Author

This need #897 resolved first.

@ksbeattie ksbeattie requested a review from dangunter June 30, 2022 18:14
@lbianchi-lbl lbianchi-lbl added the CI:run-integration triggers_workflow: Integration label Jun 30, 2022
@idaes-build idaes-build removed the CI:run-integration triggers_workflow: Integration label Jun 30, 2022
Copy link
Member

@dangunter dangunter left a comment

Choose a reason for hiding this comment

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

All 329 files look good

@lbianchi-lbl lbianchi-lbl merged commit d217129 into IDAES:main Jun 30, 2022
bpaul4 added a commit to MAZamarripa/idaes-pse that referenced this pull request Jul 18, 2022
* Sphinx Documentation Build Issue (IDAES#890)

* switch lang flag to 'en'

* Flag formatting

* Update path reference

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* Running black on the entire repo (IDAES#894)

* Running black on the entire repo

* Add pinned requirement for Black stable version

* Add CI check to ensure code is Black-formatted

Co-authored-by: Ludovico Bianchi <[email protected]>

* Fix PySMO tests (IDAES#903)

* Minor change to trigger tests

* Added abs to tolerance check

* Run black

* Remove string comparison

* Tighten tolerance

* Fixed kriging test by removing variable dependence

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
Co-authored-by: Daison2102 <[email protected]>
@ksbeattie ksbeattie mentioned this pull request Aug 5, 2022
andrewlee94 pushed a commit that referenced this pull request Oct 14, 2022
* updating power plant costing to new costing framework

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

* Fixing test issues, bringing in MEA_CCS code (#1)

* Sphinx Documentation Build Issue (#890)

* switch lang flag to 'en'

* Flag formatting

* Update path reference

* updating power plant capcost and QGESS tests to run as expected

* bring over MEA_CCS updates and tests

* running black on costing/ directory

* move custom dicts to new file

* fix some spacing causing doc build errors

* Replace method calls with UnitModelCostingBlocks

* Running black on the entire repo (#894)

* Running black on the entire repo

* Add pinned requirement for Black stable version

* Add CI check to ensure code is Black-formatted

Co-authored-by: Ludovico Bianchi <[email protected]>

* Fix PySMO tests (#903)

* Minor change to trigger tests

* Added abs to tolerance check

* Run black

* Remove string comparison

* Tighten tolerance

* Fixed kriging test by removing variable dependence

* bring in report method updates

* bring in more MEA CCS updates

* Add check on total TPC

* final formatting fixes

* Update report method

Adding cost of electricity and cost of capture to report method

* Black reformatting

* Update report method

Fixing units of cost of electricity

Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
Co-authored-by: Daison2102 <[email protected]>

* costing updates

* costing updates

* improving generic variable O&M costs calculation

* Updating currency and basis unit handling, other minor fixes

* Zipping together costing dictionaries

* Improvements from review comments

* Updating tests for new changes

* Updating author tags

* Removing QGESS tests, updating NGCC tests, adding capcost tests, param unit fixes

* Sort author list

* General improvements and cost variable unit corrections

* Removing deprecated default arguments

* Addressing most review comments

* Addressing more review comments

* Testing and coverage improvements

* Resolving pylint and directory reference issues

* Separating power plant currency units

* cleaning up comments

* Final fixes from review comments

* Add some checks to json regeneration test

Co-authored-by: Miguel Zamarripa-Perez <[email protected]>
Co-authored-by: Daison2102 <[email protected]>
Co-authored-by: Keith Beattie <[email protected]>
Co-authored-by: Ludovico Bianchi <[email protected]>
Co-authored-by: OOAmusat <[email protected]>
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

No open projects

Development

Successfully merging this pull request may close these issues.

4 participants