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.

Sign up for GitHub

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

Jump to bottom

Integrate 2023 EIA 860 Early Release #3681

Merged
merged 11 commits into from
Jun 21, 2024
Merged

Integrate 2023 EIA 860 Early Release #3681

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b3c4927
extract: column maps
cmgosnell Jun 18, 2024
bd62a79
add the new proposed tab to the assets
cmgosnell Jun 18, 2024
accf4d0
fix column names & add new bools & add field descriptions
cmgosnell Jun 18, 2024
89f5794
pudl id mapping, removing null generator ids, light updates to mappin…
cmgosnell Jun 19, 2024
23f36f8
add in the less than 5 MW plants into the pudl id mapping sheet
cmgosnell Jun 19, 2024
dfab2e4
validation updates and pr responses
cmgosnell Jun 20, 2024
b72cc8e
Merge branch 'main' into 2023-eia860-er
cmgosnell Jun 20, 2024
488c3a4
fix asset_checks
cmgosnell Jun 21, 2024
63e8354
clean up helper function
cmgosnell Jun 21, 2024
27c2239
Merge branch 'main' into 2023-eia860-er
cmgosnell Jun 21, 2024
9c2a683
Update src/pudl/helpers.py
cmgosnell Jun 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/pudl/extract/eia860.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ def get_dtypes(page, **partition):
"raw_eia860__generator_proposed",
"raw_eia860__generator_retired",
"raw_eia860__generator_energy_storage_existing",
"raw_eia860__generator_energy_storage_proposed",
"raw_eia860__generator_energy_storage_retired",
"raw_eia860__generator_solar_existing",
"raw_eia860__generator_solar_retired",
Expand Down
2 changes: 1 addition & 1 deletion src/pudl/metadata/sources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
CONTRIBUTORS["catalyst-cooperative"],
],
"working_partitions": {
"years": sorted(set(range(2001, 2023))),
"years": sorted(set(range(2001, 2024))),
},
"keywords": sorted(
set(
Expand Down
16 changes: 8 additions & 8 deletions src/pudl/package_data/eia860/column_maps/boiler_cooling.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
year_index,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
utility_name_eia,,,,,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
plant_name_eia,,,,,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id
cooling_id_eia,cooling_id,cooling_id,cooling_id,cooloing_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id
steam_plant_type_code,,,,,,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type
year_index,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
utility_name_eia,,,,,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
plant_name_eia,,,,,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id
cooling_id_eia,cooling_id,cooling_id,cooling_id,cooloing_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id,cooling_id
steam_plant_type_code,,,,,,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type
18 changes: 9 additions & 9 deletions src/pudl/package_data/eia860/column_maps/boiler_generator_assn.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
year_index,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022
utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id
generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id
boiler_generator_assn_type_code,generator_association,generator_association,generator_association,generator_association,,,,,,,,,,
steam_plant_type_code,,,,,,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type
plant_name_eia,,,,,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
utility_name_eia,,,,,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
year_index,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023
utility_id_eia,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id,utility_id
plant_id_eia,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code,plant_code
boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id,boiler_id
generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id,generator_id
boiler_generator_assn_type_code,generator_association,generator_association,generator_association,generator_association,,,,,,,,,,,
steam_plant_type_code,,,,,,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type,steam_plant_type
plant_name_eia,,,,,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name,plant_name
utility_name_eia,,,,,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name,utility_name
Loading