Skip to content

Commit

Permalink
Integrate EIA 923 ER (#3721)
Browse files Browse the repository at this point in the history
* Update package data for EIA 923 ER

* Fill in None value fuel_type_code_aer for core_eia923__monthly_generation_fuel_nuclear table

* Add release notes

* Add changes to EIA860 table lengths

* Add comment to prime_mover_code code_fix

* Add column changes

* troublesome aer to mer migrations

* Resolve alembic migration conflicts.

* Remove null migration.

* Rename mer_fuel_type_code to aer_fuel_type_code

* Update field and table descriptsion to include MER and AER

* Replace fuel_type_code_aer with fuel_type_code_agg

* replace core_eia__codes_fuel_types_aer with core_eia__codes_fuel_types_agg

* reset alembic

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

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

* Update minmax row values

---------

Co-authored-by: Zane Selvans <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: E. Belfer <[email protected]>
  • Loading branch information
4 people authored Jul 23, 2024
1 parent 0883eb8 commit 4cba9f5
Show file tree
Hide file tree
Showing 42 changed files with 532 additions and 1,266 deletions.
5 changes: 4 additions & 1 deletion docs/release_notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@ EIA 860
regarding energy storage and solar generators. See issue :issue:`3676` and PR
:pr:`3681`.

EIA 923
~~~~~~~
* Added EIA 923 early release data from 2023. See :issue:`3719` and PR :pr:`3721`.

FERC 714
~~~~~~~~

* Added :ref:`core_ferc714__yearly_planning_area_demand_forecast` based on FERC
Form 714, Part III, Schedule 2b. Data includes forecasted demand and net energy load.
See issue :issue:`3519` and PR :pr:`3670`.
Expand Down

This file was deleted.

This file was deleted.

24 changes: 0 additions & 24 deletions migrations/versions/0f594b84fbe7_.py

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 4cba9f5

Please sign in to comment.