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

Merge dev into main for 2023-12-18 #3170

Merged
merged 9 commits into from
Dec 18, 2023
Merged

Merge dev into main for 2023-12-18 #3170

merged 9 commits into from
Dec 18, 2023

Conversation

zaneselvans
Copy link
Member

zaneselvans and others added 9 commits December 13, 2023 17:06
* Add CEMS concurrency limit to pudl_etl command

* Add epacems_workers argument to pudl_etl
Remove obsolete Docker data access instructions.
…cols (#2818)

* Rename static tables

* Rename Census DP1 assets

* Test doc fix

* Update core table names for EIA 860, 923, harvested tables, FERC1, code

* Fix integration tests

* Fix alembic

* Rename 714, 861, epacems

* update tests and rest of assets

* Fix validation tests

* Rename ferc output assets

* Rename denorm_cash_flow_ferc1 and remove leading underscore from cross refs in pudl_db docs

* Rename a missing ferc output table and add migration

* Rename EIA denorm assets

* Recreate ferc rename migration

* Add docs cross ref fix for intermediate assets

* Resolve small denorm EIA rename issues

* Clean up notebooks

* Apply naming convention to allocate generation fuel assets

* Fix a missing gen fuel asset name in PudlTabl

* Update migrations post ferc1 output rename merge

* Update contributor facing documentation with new asset naming conventions

* Add new naming convention to user facing documentation

* Correct allocate-get-fuel down revision

* Apply new naming convention to ferc714 respondents, hourly demand and eia861 service territories

* Fix refs to renamed tables in release notes

* Rename ferc714 and eia861 output tables in integration tests

* Add missing balance authority fk migration

* Rename out_ferc714__fipsified_respondents to out_ferc714__respondents_with_fips

* Respond to first round of Austen's comments

* Update rename-core-assets and clarify raw asset sentence

* Restrict astroid version to avoid random autoapi error

* Reset migrations and fix old table refs in docs

* Fix names of inputs to exploded tables and xbrl calculation fixes

* Rename mcoe and ppl assets

* Fix small ppl migration issue

* Format and sort intermediate resource name cross refs in data dictionary

* Add upstream mcoe assets back to metadata

* Update stragler PudlTabl method name

* Add frequency to ppl asset name and some clean up

* rename six of the non-contreversial FERC1 tables (core + out)

* initial rename of the FERC1 core and out tables

* add db migration

* rename the ferc1 transformer classes in line with new table names

* Incorporate some docs changes from #2912

* FINAL FINAL rename of ferc assets

* ooooops remove the eia860m extraction edit bc that was not supposed to be in here ooop

* Remove README.rst from index.rst and move intro content to index

* Add deprecation warnings to PudlTabl and add minor naming docs updates

* Rename heat_rate_mmbtu_mwh -> heat_rate_mmbtu_mwh_by_unit

* Rename heat rate mmbtu mwh to follow existing naming convention

* Remove PudlTabl removal data and make assn table name sources alphabetical

* Explain why CEMS is stored as parquet

* Rename heat_rate_mmbtu_mwh_eia/ferc1 columns to unit_heat_rate_mmbtu_per_mwh_eia/ferc1

* Remove unused ppe_cols_to_grab variable

* Make association asset names more consistent

* Add association assset naming convention to docs

* Resolve migration issues with unit heat rate column

* Update conda-lock.yml and rendered conda environment files.

* Recreate heat rate migration revision

* Use pudl_sqlite_io_manager for fuel_cost_by_generator assets

* Update conda-lock.yml and rendered conda environment files.

* Checkout lock files from dev

* Update conda-lock.yml and rendered conda environment files.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

For more information, see https://pre-commit.ci

* Remove intro.rst and update ferc s3 urls again

* Update conda-lock.yml and rendered conda environment files.

* Remove some old table names from metaddata

* Update conda-lock.yml and rendered conda environment files.

* [pre-commit.ci] auto fixes from pre-commit.com hooks

For more information, see https://pre-commit.ci

* Remove ref to non existant doc page, remove files no longer in dev

---------

Co-authored-by: bendnorman <[email protected]>
Co-authored-by: Bennett Norman <[email protected]>
Co-authored-by: Christina Gosnell <[email protected]>
Co-authored-by: bendnorman <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

Copy link

codecov bot commented Dec 18, 2023

Codecov Report

Attention: 8 lines in your changes are missing coverage. Please review.

Comparison is base (146b787) 92.7% compared to head (b8fa2b5) 92.6%.
Report is 1 commits behind head on main.

Files Patch % Lines
src/pudl/analysis/eia_ferc1_train.py 84.2% 3 Missing ⚠️
src/pudl/etl/cli.py 33.3% 2 Missing ⚠️
src/pudl/metadata/classes.py 90.0% 1 Missing ⚠️
src/pudl/output/pudltabl.py 80.0% 1 Missing ⚠️
src/pudl/transform/eia860.py 66.7% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #3170     +/-   ##
=======================================
- Coverage   92.7%   92.6%   -0.0%     
=======================================
  Files        134     134             
  Lines      12597   12611     +14     
=======================================
+ Hits       11672   11682     +10     
- Misses       925     929      +4     

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

@zaneselvans zaneselvans merged commit a19bd57 into main Dec 18, 2023
19 of 20 checks passed
@zaneselvans zaneselvans deleted the nightly-2023-12-18 branch December 18, 2023 16:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants