diff --git a/docs/release_notes.rst b/docs/release_notes.rst index cdf13cada1..4b90c5c4dc 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/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml index 5c13eadc43..62a4bef7a0 100644 --- a/environments/conda-linux-64.lock.yml +++ b/environments/conda-linux-64.lock.yml @@ -333,7 +333,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h459d7ec_0 - - fonttools=4.44.0=py311h459d7ec_0 + - fonttools=4.44.1=py311h459d7ec_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311ha6695c7_0 diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml index 78465d4044..8a0295ffce 100644 --- a/environments/conda-lock.yml +++ b/environments/conda-lock.yml @@ -4332,7 +4332,7 @@ package: category: main optional: false - name: fonttools - version: 4.44.0 + version: 4.44.1 manager: conda platform: linux-64 dependencies: @@ -4341,10 +4341,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.44.0-py311h459d7ec_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.44.1-py311h459d7ec_0.conda hash: - md5: f12f4d7361178f94df1052d6b63fd868 - sha256: d1a0023bc0a35b9e3f9be10b6fe5f305a0e14fe4e956d688304413f4234ae286 + md5: 6d9f40aa7c1fcd9cef01fddb5caed228 + sha256: e8a9ed75baea05eb2de54f52792f2f463915019ee91f75af178c59bb7a747ec2 category: main optional: false - name: gitdb @@ -12222,7 +12222,7 @@ package: category: main optional: false - name: fonttools - version: 4.44.0 + version: 4.44.1 manager: conda platform: osx-64 dependencies: @@ -12230,10 +12230,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.44.0-py311he705e18_0.conda + url: https://conda.anaconda.org/conda-forge/osx-64/fonttools-4.44.1-py311he705e18_0.conda hash: - md5: 548f6770647b112d218577be7c10f644 - sha256: 30a7405f8689032835c34efae453af26ae5fb8750a90fe4eb907686bc2468902 + md5: 762a6863f0c6fcb793260016f654ae3e + sha256: 04b56801d5eccec937f83a081851b256eefab920833d52889cb909969287fe14 category: main optional: false - name: gitdb @@ -20034,7 +20034,7 @@ package: category: main optional: false - name: fonttools - version: 4.44.0 + version: 4.44.1 manager: conda platform: osx-arm64 dependencies: @@ -20042,10 +20042,10 @@ package: munkres: "" python: ">=3.11,<3.12.0a0" python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.44.0-py311h05b510d_0.conda + url: https://conda.anaconda.org/conda-forge/osx-arm64/fonttools-4.44.1-py311h05b510d_0.conda hash: - md5: b39a3eefda8e93bbdf5be812e17bf521 - sha256: eefa9107f6b33d65b951aec2f3022da94c146656d55e66fbdceb6e36f2a9cde4 + md5: 238ee16be84c5667adbfb1f0b6671166 + sha256: af81d6a4596b0ad2d2defd32ed2e06c084137243bd704a1ec174df6470bd4ac9 category: main optional: false - name: gitdb diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml index b2d26a1afd..9438b3a74e 100644 --- a/environments/conda-osx-64.lock.yml +++ b/environments/conda-osx-64.lock.yml @@ -312,7 +312,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311h2725bcf_0 - - fonttools=4.44.0=py311he705e18_0 + - fonttools=4.44.1=py311he705e18_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311hfd95bfa_0 diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml index 23ea4d9a59..54e8170474 100644 --- a/environments/conda-osx-arm64.lock.yml +++ b/environments/conda-osx-arm64.lock.yml @@ -312,7 +312,7 @@ dependencies: - coloredlogs=14.0=pyhd8ed1ab_3 - comm=0.1.4=pyhd8ed1ab_0 - coverage=7.3.2=py311heffc1b2_0 - - fonttools=4.44.0=py311h05b510d_0 + - fonttools=4.44.1=py311h05b510d_0 - gitdb=4.0.11=pyhd8ed1ab_0 - graphql-core=3.2.3=pyhd8ed1ab_0 - grpcio=1.59.2=py311h79dd126_0 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/package_data/glue/pudl_id_mapping.xlsx b/src/pudl/package_data/glue/pudl_id_mapping.xlsx index c181119ea2..fcf5e59b56 100644 Binary files a/src/pudl/package_data/glue/pudl_id_mapping.xlsx and b/src/pudl/package_data/glue/pudl_id_mapping.xlsx differ diff --git a/src/pudl/package_data/glue/utility_id_pudl.csv b/src/pudl/package_data/glue/utility_id_pudl.csv index d6006d3167..d233fe5907 100644 --- a/src/pudl/package_data/glue/utility_id_pudl.csv +++ b/src/pudl/package_data/glue/utility_id_pudl.csv @@ -15827,4 +15827,118 @@ utility_id_pudl,utility_id_ferc1,utility_name_ferc1,utility_id_eia,utility_name_ 15869,,,65634,Highpeak Solar LLC 15870,,,1937004, 15871,446,"Transource Oklahoma, LLC",, -15872,447,"Mountrail-Williams Electric Cooperative",, +15872,447,Mountrail-Williams Electric Cooperative,, +15873,,,65777,Urban Grid Solar +15874,,,65835,"Clean Energy Future - Trumbull, LLC." +15875,,,65815,Sunraycer Assets I LLC +15876,,,65805,"GulfStar Power, LLC" +15877,,,65831,"Danish Fields Solar, LLC" +15878,,,65759,Ash Creek +15879,,,65829,"Hill Solar 1, LLC" +15880,,,65832,"Cottonwood Bayou Solar, LLC" +15881,,,65823,"Myrtle Solar, LLC" +15882,,,65824,"BT Hickerson Solar, LLC" +15883,,,65774,"Fence Post Solar Project, LLC" +15884,,,65799,"Enel Green Power Estonian Solar Project, LLC" +15885,,,65751,RE Papago LLC +15886,,,65821,Hecate Grid Intrepid 1 LLC +15887,,,65762,"Elevate Middletown, LLC" +15888,,,65826,"Roadrunner Crossing Wind Farm, LLC" +15889,,,65819,"Ables Springs Solar, LLC" +15890,,,65782,Ben Milam Solar 3 LLC +15891,,,65781,Sky Ranch Solar and Storage +15892,,,65794,Indiana Crossroads Wind Farm II LLC +15893,,,65788,Ben Milam Solar 1 LLC +15894,,,65816,OE_ESCL +15895,,,65812,"Lumberton PV I, LLC" +15896,,,65814,GGS Energy LLC +15897,,,65743,"SR Russellville, LLC" +15898,,,65728,Brenneman Solar LLC +15899,,,65772,"River Ferry Solar 1, LLC" +15900,,,65808,"La Casa Wind, LLC" +15901,,,65757,"Briscoe Wind Farm, LLC" +15902,,,65765,Borden County Battery Energy Storage System LLC +15903,,,65830,"Myrtle Storage, LLC" +15904,,,65833,"Danish Fields Storage, LLC" +15905,,,65742,"Blue Bird Solar, LLC" +15906,,,65796,"North Fork Solar Project, LLC" +15907,,,65739,"Lake Iris Solar, LLC" +15908,,,65741,"Hart Solar Partners, LLC" +15909,,,65789,"Marion County Solar Project, LLC" +15910,,,65780,"Clearwater Wind III, LLC" +15911,,,65837,Freestone Solar LLC +15912,,,65778,OE_CAB1 +15913,,,65754,VESI 12 LLC +15914,,,65764,Pier S Energy Storage LLC +15915,,,65786,"SR DeSoto III, LLC" +15916,,,65740,"Genesee Solar Energy, LLC" +15917,,,65791,"Robin Hollow Solar, LLC" +15918,,,65303,"SR McNeal, LLC" +15919,,,65783,Hayhurst Texas Solar +15920,,,65785,"Luminace Sunbeam Development Holdings, LLC" +15921,,,65755,VESI 23 LLC +15922,,,65761,GB Arthur Kill Storage LLC +15923,,,65840,SMT Los Fresnos LLC +15924,,,65838,SMT Mercedes LLC +15925,,,65841,SMT Elsa LLC +15926,,,65842,SMT Bay City LLC +15927,,,65843,SMT Alamo LLC +15928,,,65844,SMT Santa Rosa LLC +15929,,,65845,SMT Rio Grande I LLC +15930,,,65846,SMT Rio Grande II LLC +15931,,,65839,SMT Mission LLC +15932,,,65847,SMT Harlingen II LLC +15933,,,65775,"RPCA Solar 1, LLC" +15934,,,65792,"IIT Energy Tech Partners, LLC" +15935,,,65807,"Energy 49, LLC" +15936,,,65747,"AB Newark (Fund IV) Operating, LLC" +15937,,,65043,Madison Energy Investments LLC +15938,,,65721,NY USLE Carthage SR26 A LLC +15939,,,65793,"DG Empire Lumen 2023, LLC" +15940,,,65748,"Herrington Solar, LLC" +15941,,,65758,Helios Energy New York 15 LLC +15942,,,65779,"SEPV Cuyama, LLC" +15943,,,65813,"CES Electron Farm One, LLC" +15944,,,65771,NY USLE Glenville Freemans Bridge LLC +15945,,,65770,NY USLE Copenhagen CR194 LLC +15946,,,65767,"Solar DG NJ BEMS West, LLC" +15947,,,65766,"Solar DG NJ BEMS East, LLC" +15948,,,65795,South County Packing +15949,,,65760,"Solar DG NJ Brookdale, LLC" +15950,,,65722,NY USLE Carthage SR26 B LLC +15951,,,65752,"DG Empire Shine, LLC" +15952,,,65776,"RPCA Solar 7, LLC" +15953,,,65806,Elk Street Solar LLC +15954,,,65667,West Shore Solar LLC +15955,,,65666,KDC Solar CV O'Donnell Property LLC +15956,,,65665,KDC Solar CV Animal Control LLC +15957,,,65664,KDC Solar CV Central MD Regional Transit LLC +15958,,,65662,KDC Solar CV Ascend One LLC +15959,,,65827,Fork in the Road Solar LLC +15960,,,65773,Renew Solar VMC LLC +15961,,,65811,Solops 371 Hoes LLC +15962,,,65836,Big Wolf Solar LLC +15963,,,60232,Clenera LLC +15964,,,65459,"Wildflower Solar, LLC" +15965,,,65533,"Champion Solar 1, LLC" +15966,,,65669,Copia Power +15967,,,65705,"DLS-Sylvan Project Co., LLC" +15968,,,65706,"DLS-Laskin Project Co., LLC" +15969,,,65707,"DLS-Jean Duluth Project Co., LLC" +15970,,,65709,"Austin Creek Solar, LLC" +15971,,,65710,"Chiltepin Solar, LLC" +15972,,,65711,"Longwing Solar, LLC" +15973,,,65712,"Patoka Solar, LLC" +15974,,,65713,"Prairie Oak Solar, LLC" +15975,,,65714,"Peri Peri Solar, LLC" +15976,,,65717,Wash. DC Department of General Services +15977,,,65744,Inland Empire Energy Storage +15978,,,65753,"Arlington Energy Associates, Co." +15979,,,65756,"Toms River Net Meter Solar, LLC" +15980,,,65787,"White Pine Fleet, LLC" +15981,,,65809,"Cannonball Solar, LLC" +15982,,,65810,Big Spring Solar LLC +15983,,,65818,"Ables Springs Storage, LLC" +15984,,,65828,Santa Barbara County +15985,,,65834,DE Shaw Renewable Investments +15986,,,65850,"Hull Street Energy, LLC" \ 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), ], ) diff --git a/test/validate/mcoe_test.py b/test/validate/mcoe_test.py index 1d3ea05d3c..b1efd9c982 100644 --- a/test/validate/mcoe_test.py +++ b/test/validate/mcoe_test.py @@ -106,11 +106,11 @@ def test_no_null_rows_mcoe(pudl_out_mcoe, live_dbs, df_name, thresh): @pytest.mark.parametrize( "df_name,monthly_rows,annual_rows", [ - ("hr_by_unit", 387_694, 32_416), + ("hr_by_unit", 387_670, 32_414), ("hr_by_gen", 599_496, 50_070), ("fuel_cost", 599_496, 50_070), - ("capacity_factor", 5_178_828, 433_286), - ("mcoe", 5_179_236, 433_320), + ("capacity_factor", 5_179_377, 433_332), + ("mcoe", 5_179_785, 433_366), ], ) def test_minmax_rows_mcoe(pudl_out_mcoe, live_dbs, monthly_rows, annual_rows, df_name):