From d84686a88393706f7e63f7815d8ab6dcd8f93875 Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Mon, 13 Nov 2023 12:13:27 -0300 Subject: [PATCH] Add EIA860 2022 final release data --- docs/release_notes.rst | 2 +- src/pudl/package_data/eia860/file_map.csv | 46 +++++++++++------------ src/pudl/package_data/eia860/skiprows.csv | 46 +++++++++++------------ src/pudl/workspace/datastore.py | 2 +- test/validate/eia_test.py | 26 ++++++------- 5 files changed, 61 insertions(+), 61 deletions(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index d9cc622e1e..e3737beea1 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -70,7 +70,7 @@ Dagster Adoption Data Coverage ^^^^^^^^^^^^^ -* Updated :doc:`data_sources/eia860` to include early release data from 2022. +* Updated :doc:`data_sources/eia860` to include final release data from 2022. * Updated :doc:`data_sources/eia923` to include early release data from 2022 and monthly YTD data as of April 2023. * Updated :doc:`data_sources/epacems` to switch from the old FTP server to the new diff --git a/src/pudl/package_data/eia860/file_map.csv b/src/pudl/package_data/eia860/file_map.csv index c2f0bba8ed..8ee4369f17 100644 --- a/src/pudl/package_data/eia860/file_map.csv +++ b/src/pudl/package_data/eia860/file_map.csv @@ -1,25 +1,25 @@ page,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022 -boiler_generator_assn,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -generator_existing,-1,-1,-1,-1,-1,-1,-1,-1,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022_Early_Release.xlsx -generator_proposed,PRGENY01.dbf,PRGENY02.dbf,PRGENY03.dbf,PRGenY04.xls,PRGenY05.xls,PRGenY06.xls,PRGenY07.xls,PRGenY08.xls,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022_Early_Release.xlsx -generator_retired,-1,-1,-1,-1,-1,-1,-1,-1,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022_Early_Release.xlsx +boiler_generator_assn,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +generator_existing,-1,-1,-1,-1,-1,-1,-1,-1,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022.xlsx +generator_proposed,PRGENY01.dbf,PRGENY02.dbf,PRGENY03.dbf,PRGenY04.xls,PRGenY05.xls,PRGenY06.xls,PRGenY07.xls,PRGenY08.xls,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022.xlsx +generator_retired,-1,-1,-1,-1,-1,-1,-1,-1,GeneratorY09.xls,GeneratorsY2010.xls,GeneratorY2011.xlsx,GeneratorY2012.xlsx,3_1_Generator_Y2013.xlsx,3_1_Generator_Y2014.xlsx,3_1_Generator_Y2015.xlsx,3_1_Generator_Y2016.xlsx,3_1_Generator_Y2017.xlsx,3_1_Generator_Y2018.xlsx,3_1_Generator_Y2019.xlsx,3_1_Generator_Y2020.xlsx,3_1_Generator_Y2021.xlsx,3_1_Generator_Y2022.xlsx generator,GENY01.dbf,GENY02.dbf,GENY03.dbf,GenY04.xls,GenY05.xls,GenY06.xls,GenY07.xls,GenY08.xls,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 -ownership,OWNER.DBF,OWNERY02.DBF,OWNERY03.DBF,OwnerY04.xls,OwnerY05.xls,OwnerY06.xls,OwnerY07.xls,OwnerY08.xls,OwnerY09.xls,OwnerY2010.xls,OwnershipY2011.xlsx,OwnerY2012.xlsx,4___Owner_Y2013.xlsx,4___Owner_Y2014.xlsx,4___Owner_Y2015.xlsx,4___Owner_Y2016.xlsx,4___Owner_Y2017.xlsx,4___Owner_Y2018.xlsx,4___Owner_Y2019.xlsx,4___Owner_Y2020.xlsx,4___Owner_Y2021.xlsx,4___Owner_Y2022_Early_Release.xlsx -plant,PLANTY01.DBF,PLANTY02.DBF,PLANTY03.DBF,PlantY04.xls,PlantY05.xls,PlantY06.xls,PlantY07.xls,PlantY08.xls,PlantY09.xls,PlantY2010.xls,Plant.xlsx,PlantY2012.xlsx,2___Plant_Y2013.xlsx,2___Plant_Y2014.xlsx,2___Plant_Y2015.xlsx,2___Plant_Y2016.xlsx,2___Plant_Y2017.xlsx,2___Plant_Y2018.xlsx,2___Plant_Y2019.xlsx,2___Plant_Y2020.xlsx,2___Plant_Y2021.xlsx,2___Plant_Y2022_Early_Release.xlsx -utility,UTILY01.DBF,UTILY02.DBF,UTILY03.DBF,UtilY04.xls,UtilY05.xls,UtilY06.xls,UtilY07.xls,UtilY08.xls,UtilityY09.xls,UtilityY2010.xls,UtilityY2011.xlsx,UtilityY2012.xlsx,1___Utility_Y2013.xlsx,1___Utility_Y2014.xlsx,1___Utility_Y2015.xlsx,1___Utility_Y2016.xlsx,1___Utility_Y2017.xlsx,1___Utility_Y2018.xlsx,1___Utility_Y2019.xlsx,1___Utility_Y2020.xlsx,1___Utility_Y2021.xlsx,1___Utility_Y2022_Early_Release.xlsx -boiler_cooling,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -boiler_particulate,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -boiler_so2,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -boiler_nox,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -boiler_mercury,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -boiler_stack_flue,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -emissions_control_equipment,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022_Early_Release.xlsx -multifuel_existing,-1,-1,-1,MFExist04.xls,MFExist05.xls,MFExistY06.xls,MFExistY07.xls,MFExistY08.xls,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022_Early_Release.xlsx -multifuel_proposed,-1,-1,-1,MFProp04.xls,MFProp05.xls,MFPropY06.xls,MFPropY07.xls,MFPropY08.xls,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022_Early_Release.xlsx -multifuel_retired,-1,-1,-1,-1,-1,-1,-1,-1,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022_Early_Release.xlsx -boiler_info,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx -emission_control_strategies,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx -cooling_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx -fgp_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx -fgd_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx -stack_flue_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022_Early_Release.xlsx +ownership,OWNER.DBF,OWNERY02.DBF,OWNERY03.DBF,OwnerY04.xls,OwnerY05.xls,OwnerY06.xls,OwnerY07.xls,OwnerY08.xls,OwnerY09.xls,OwnerY2010.xls,OwnershipY2011.xlsx,OwnerY2012.xlsx,4___Owner_Y2013.xlsx,4___Owner_Y2014.xlsx,4___Owner_Y2015.xlsx,4___Owner_Y2016.xlsx,4___Owner_Y2017.xlsx,4___Owner_Y2018.xlsx,4___Owner_Y2019.xlsx,4___Owner_Y2020.xlsx,4___Owner_Y2021.xlsx,4___Owner_Y2022.xlsx +plant,PLANTY01.DBF,PLANTY02.DBF,PLANTY03.DBF,PlantY04.xls,PlantY05.xls,PlantY06.xls,PlantY07.xls,PlantY08.xls,PlantY09.xls,PlantY2010.xls,Plant.xlsx,PlantY2012.xlsx,2___Plant_Y2013.xlsx,2___Plant_Y2014.xlsx,2___Plant_Y2015.xlsx,2___Plant_Y2016.xlsx,2___Plant_Y2017.xlsx,2___Plant_Y2018.xlsx,2___Plant_Y2019.xlsx,2___Plant_Y2020.xlsx,2___Plant_Y2021.xlsx,2___Plant_Y2022.xlsx +utility,UTILY01.DBF,UTILY02.DBF,UTILY03.DBF,UtilY04.xls,UtilY05.xls,UtilY06.xls,UtilY07.xls,UtilY08.xls,UtilityY09.xls,UtilityY2010.xls,UtilityY2011.xlsx,UtilityY2012.xlsx,1___Utility_Y2013.xlsx,1___Utility_Y2014.xlsx,1___Utility_Y2015.xlsx,1___Utility_Y2016.xlsx,1___Utility_Y2017.xlsx,1___Utility_Y2018.xlsx,1___Utility_Y2019.xlsx,1___Utility_Y2020.xlsx,1___Utility_Y2021.xlsx,1___Utility_Y2022.xlsx +boiler_cooling,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +boiler_particulate,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +boiler_so2,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +boiler_nox,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +boiler_mercury,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +boiler_stack_flue,-1,-1,-1,-1,-1,-1,-1,-1,EnviroAssocY09.xls,EnviroAssocY2010.xls,EnviroAssocY2011.xlsx,EnviroAssocY2012.xlsx,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +emissions_control_equipment,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,6_1_EnviroAssoc_Y2013.xlsx,6_1_EnviroAssoc_Y2014.xlsx,6_1_EnviroAssoc_Y2015.xlsx,6_1_EnviroAssoc_Y2016.xlsx,6_1_EnviroAssoc_Y2017.xlsx,6_1_EnviroAssoc_Y2018.xlsx,6_1_EnviroAssoc_Y2019.xlsx,6_1_EnviroAssoc_Y2020.xlsx,6_1_EnviroAssoc_Y2021.xlsx,6_1_EnviroAssoc_Y2022.xlsx +multifuel_existing,-1,-1,-1,MFExist04.xls,MFExist05.xls,MFExistY06.xls,MFExistY07.xls,MFExistY08.xls,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022.xlsx +multifuel_proposed,-1,-1,-1,MFProp04.xls,MFProp05.xls,MFPropY06.xls,MFPropY07.xls,MFPropY08.xls,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022.xlsx +multifuel_retired,-1,-1,-1,-1,-1,-1,-1,-1,MultiFuelY09.xls,MultiFuelY2010.xls,MultifuelY2011.xlsx,MultifuelY2012.xlsx,3_4_Multifuel_Y2013.xlsx,3_4_Multifuel_Y2014.xlsx,3_4_Multifuel_Y2015.xlsx,3_5_Multifuel_Y2016.xlsx,3_5_Multifuel_Y2017.xlsx,3_5_Multifuel_Y2018.xlsx,3_5_Multifuel_Y2019.xlsx,3_5_Multifuel_Y2020.xlsx,3_5_Multifuel_Y2021.xlsx,3_5_Multifuel_Y2022.xlsx +boiler_info,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx +emission_control_strategies,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx +cooling_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx +fgp_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx +fgd_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx +stack_flue_equipment,-1,-1,-1,-1,-1,-1,-1,-1,EnviroEquipY09.xls,EnviroEquipY2010.xls,EnviroEquip.xlsx,EnviroEquipY2012.xlsx,6_2_EnviroEquip_Y2013.xlsx,6_2_EnviroEquip_Y2014.xlsx,6_2_EnviroEquip_Y2015.xlsx,6_2_EnviroEquip_Y2016.xlsx,6_2_EnviroEquip_Y2017.xlsx,6_2_EnviroEquip_Y2018.xlsx,6_2_EnviroEquip_Y2019.xlsx,6_2_EnviroEquip_Y2020.xlsx,6_2_EnviroEquip_Y2021.xlsx,6_2_EnviroEquip_Y2022.xlsx \ No newline at end of file diff --git a/src/pudl/package_data/eia860/skiprows.csv b/src/pudl/package_data/eia860/skiprows.csv index d77d70d45a..4bcc0ddc7e 100644 --- a/src/pudl/package_data/eia860/skiprows.csv +++ b/src/pudl/package_data/eia860/skiprows.csv @@ -1,25 +1,25 @@ year_index,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022 -boiler_generator_assn,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -utility,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -ownership,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -plant,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -generator_existing,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -generator_proposed,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -generator_retired,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 +boiler_generator_assn,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +utility,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +ownership,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +plant,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +generator_existing,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +generator_proposed,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +generator_retired,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 generator,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 -boiler_cooling,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -boiler_particulate,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -boiler_so2,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -boiler_nox,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2 -boiler_mercury,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2 -boiler_stack_flue,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -emissions_control_equipment,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,2 -multifuel_existing,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -multifuel_proposed,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -multifuel_retired,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -boiler_info,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -emission_control_strategies,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -cooling_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -fgp_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -fgd_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 -stack_flue_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,2 +boiler_cooling,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +boiler_particulate,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +boiler_so2,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +boiler_nox,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1 +boiler_mercury,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1 +boiler_stack_flue,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +emissions_control_equipment,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1 +multifuel_existing,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +multifuel_proposed,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +multifuel_retired,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +boiler_info,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +emission_control_strategies,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +cooling_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +fgp_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +fgd_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 +stack_flue_equipment,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1 \ No newline at end of file diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 94fdfa5ade..f97fdadc62 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -169,7 +169,7 @@ class ZenodoDoiSettings(BaseSettings): # Sandbox DOIs are provided for reference censusdp1tract: ZenodoDoi = "10.5281/zenodo.4127049" # censusdp1tract: ZenodoDoi = "10.5072/zenodo.674992" - eia860: ZenodoDoi = "10.5281/zenodo.8164776" + eia860: ZenodoDoi = "10.5281/zenodo.10067566" # eia860: ZenodoDoi = "10.5072/zenodo.1222854" eia860m: ZenodoDoi = "10.5281/zenodo.8188017" # eia860m: ZenodoDoi = "10.5072/zenodo.1225517" diff --git a/test/validate/eia_test.py b/test/validate/eia_test.py index 467bb5b37c..2201ef4ac0 100644 --- a/test/validate/eia_test.py +++ b/test/validate/eia_test.py @@ -46,20 +46,20 @@ def test_no_null_cols_eia(pudl_out_eia, live_dbs, cols, df_name): "df_name,raw_rows,monthly_rows,annual_rows", [ ("bf_eia923", 1_559_257, 1_559_257, 127_412), - ("bga_eia860", 141_638, 141_638, 141_638), - ("boil_eia860", 83_354, 83_354, 83_354), + ("bga_eia860", 141_652, 141_652, 141_652), + ("boil_eia860", 83_356, 83_356, 83_356), ("frc_eia923", 639_647, 261_583, 25_370), - ("gen_eia923", None, 5_178_828, 433_286), - ("gens_eia860", 556_586, 556_586, 556_586), - ("gf_eia923", 2_879_896, 2_879_896, 244_796), - ("own_eia860", 89_687, 89_687, 89_687), - ("plants_eia860", 200_210, 200_210, 200_210), - ("pu_eia860", 199_332, 199_332, 199_332), - ("utils_eia860", 139_715, 139_715, 139_715), - ("emissions_control_equipment_eia860", 56_612, 56_612, 56_612), - ("denorm_emissions_control_equipment_eia860", 56_612, 56_612, 56_612), - ("boiler_emissions_control_equipment_assn_eia860", 77_707, 77_707, 77_707), - ("boiler_cooling_assn_eia860", 41_280, 41_280, 41_280), + ("gen_eia923", None, 5_179_377, 433_332), + ("gens_eia860", 556_948, 556_948, 556_948), + ("gf_eia923", 2_879_884, 2_879_884, 244_795), + ("own_eia860", 89_741, 89_741, 89_741), + ("plants_eia860", 200_514, 200_514, 200_514), + ("pu_eia860", 199_635, 199_635, 199_635), + ("utils_eia860", 139_883, 139_883, 139_883), + ("emissions_control_equipment_eia860", 56_616, 56_616, 56_616), + ("denorm_emissions_control_equipment_eia860", 56_616, 56_616, 56_616), + ("boiler_emissions_control_equipment_assn_eia860", 77_705, 77_705, 77_705), + ("boiler_cooling_assn_eia860", 41_282, 41_282, 41_282), ("boiler_stack_flue_assn_eia860", 41_673, 41_673, 41_673), ], )