From e6b07f18b50bae85f9168dbf2103889630fdd89f Mon Sep 17 00:00:00 2001 From: Roberto Zanchi Date: Thu, 9 Nov 2023 16:58:28 -0500 Subject: [PATCH 01/12] new eia923-2022 DOI update --- src/pudl/workspace/datastore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 94fdfa5ade..98b9a08449 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -175,8 +175,8 @@ class ZenodoDoiSettings(BaseSettings): # eia860m: ZenodoDoi = "10.5072/zenodo.1225517" eia861: ZenodoDoi = "10.5281/zenodo.8231268" # eia861: ZenodoDoi = "10.5072/zenodo.1229930" - eia923: ZenodoDoi = "10.5281/zenodo.8172818" - # eia923: ZenodoDoi = "10.5072/zenodo.1217724" + # eia923: ZenodoDoi = "10.5281/zenodo.8172818" + eia923: ZenodoDoi = "10.5281/zenodo.10067550" eia_bulk_elec: ZenodoDoi = "10.5281/zenodo.7067367" # eia_bulk_elec: ZenodoDoi = "10.5072/zenodo.1103572" epacamd_eia: ZenodoDoi = "10.5281/zenodo.7900974" From 5ca4d2a53d1584d0ed35c9ed64bda5d48ab740c1 Mon Sep 17 00:00:00 2001 From: Roberto Zanchi Date: Tue, 14 Nov 2023 09:45:09 -0500 Subject: [PATCH 02/12] Updated DOI --- src/pudl/workspace/input-output.ts | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 src/pudl/workspace/input-output.ts diff --git a/src/pudl/workspace/input-output.ts b/src/pudl/workspace/input-output.ts new file mode 100644 index 0000000000..848d0a2d0d --- /dev/null +++ b/src/pudl/workspace/input-output.ts @@ -0,0 +1,3 @@ +export PUDL_OUTPUT=/Users/rzanchi/Desktop/pudl/pudl_output + +export PUDL_INPUT=/Users/rzanchi/Desktop/pudl/pudl_input From 2f390120275ac6a4b3cd5defe784071301cc495a Mon Sep 17 00:00:00 2001 From: Roberto Zanchi Date: Tue, 21 Nov 2023 14:34:07 -0500 Subject: [PATCH 03/12] Update file_map and skiprows --- src/pudl/package_data/eia923/file_map.csv | 20 ++++++++++---------- src/pudl/package_data/eia923/skiprows.csv | 22 +++++++++++----------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pudl/package_data/eia923/file_map.csv b/src/pudl/package_data/eia923/file_map.csv index 73dc128416..de7407422b 100644 --- a/src/pudl/package_data/eia923/file_map.csv +++ b/src/pudl/package_data/eia923/file_map.csv @@ -1,14 +1,14 @@ page,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023 -boiler_fuel,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx +boiler_fuel,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx coal_stocks,-1,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,-1,-1,-1 -energy_storage,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -generation_fuel,f906920y2001.xls,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -generator,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -oil_stocks,-1,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx +energy_storage,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +generation_fuel,f906920y2001.xls,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +generator,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +oil_stocks,-1,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx petcoke_stocks,-1,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,-1,-1,-1 -plant_frame,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -puerto_rico,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -stocks,f906920y2001.xls,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx -plant_frame_puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Early_Release.xlsx,EIA923_Schedules_2_3_4_5_M_04_2023_21JUN2023.xlsx +plant_frame,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +puerto_rico,-1,-1,-1,-1,-1,-1,-1,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +stocks,f906920y2001.xls,f906920y2002.xls,f906920_2003.xls,f906920_2004.xls,f906920_2005.xls,f906920_2006.xls,f906920_2007.xls,eia923December2008.xls,EIA923 SCHEDULES 2_3_4_5 M Final 2009 REVISED 05252011.XLS,EIA923 SCHEDULES 2_3_4_5 Final 2010.xls,EIA923_Schedules_2_3_4_5_2011_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2012_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_2013_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2014_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2015_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2016_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2017_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2018_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx +plant_frame_puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedules_2_3_4_5_M_12_2019_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2020_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2021_Final_Revision.xlsx,EIA923_Schedules_2_3_4_5_M_12_2022_Final.xlsx,EIA923_Schedules_2_3_4_5_M_08_2023_19OCT2023.xlsx emissions_control,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,EIA923_Schedule_8_Annual_Environmental_Information_2012_Final_Revision.xlsx,EIA923_Schedule_8_PartsA-D_EnvData_2013_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2014_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2015_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2016_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Envir_Infor_2017_Final.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2018_Final.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2019_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2020_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2021_Final_Revision.xlsx,EIA923_Schedule_8_Annual_Environmental_Information_2022_Early_Release.xlsx,-1 \ No newline at end of file diff --git a/src/pudl/package_data/eia923/skiprows.csv b/src/pudl/package_data/eia923/skiprows.csv index 758744ab14..8bd8fd0531 100644 --- a/src/pudl/package_data/eia923/skiprows.csv +++ b/src/pudl/package_data/eia923/skiprows.csv @@ -1,14 +1,14 @@ year_index,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023 -generation_fuel,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,5,6,5 -puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,6,6,6,7,5 -stocks,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,5,6,4 -oil_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6,4 +generation_fuel,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,5 +puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,6,6,6,6,5 +stocks,7,7,7,7,7,7,7,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 +oil_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,4 coal_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,-1,-1,-1 petcoke_stocks,-1,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,-1,-1,-1 -energy_storage,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,6,4 -boiler_fuel,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,6,4 -generator,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,6,4 -fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,7,6,7,4,4,4,4,4,4,4,4,4,4,4,5,3 -plant_frame,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,5,3 -plant_frame_puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,5,3 -emissions_control,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,4,4,4,4,4,4,4,5,-1 \ No newline at end of file +energy_storage,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,5,5,5,5,5,4 +boiler_fuel,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 +generator,-1,-1,-1,-1,-1,-1,-1,7,7,7,5,5,5,5,5,5,5,5,5,5,5,5,4 +fuel_receipts_costs,-1,-1,-1,-1,-1,-1,-1,7,6,7,4,4,4,4,4,4,4,4,4,4,4,4,3 +plant_frame,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,4,3 +plant_frame_puerto_rico,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,4,3 +emissions_control,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,4,4,4,4,4,4,4,4,4,4,4,-1 \ No newline at end of file From 861ead147eb8f752d92d4937345fb4a5a230141e Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Wed, 22 Nov 2023 11:02:47 -0300 Subject: [PATCH 04/12] Remove accidentally committed input-output.ts file --- src/pudl/workspace/input-output.ts | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 src/pudl/workspace/input-output.ts diff --git a/src/pudl/workspace/input-output.ts b/src/pudl/workspace/input-output.ts deleted file mode 100644 index 848d0a2d0d..0000000000 --- a/src/pudl/workspace/input-output.ts +++ /dev/null @@ -1,3 +0,0 @@ -export PUDL_OUTPUT=/Users/rzanchi/Desktop/pudl/pudl_output - -export PUDL_INPUT=/Users/rzanchi/Desktop/pudl/pudl_input From 8e174bbfde63c2e1cab24d6e40110fad6b673b08 Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Wed, 22 Nov 2023 11:07:05 -0300 Subject: [PATCH 05/12] Remove sandbox reference DOIs because they are now invalid since Zenodo wiped their sandbox server --- src/pudl/workspace/datastore.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index cce538abd0..7683e9fcef 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -166,35 +166,20 @@ def get_json_string(self) -> str: class ZenodoDoiSettings(BaseSettings): """Digital Object Identifiers pointing to currently used Zenodo archives.""" - # Sandbox DOIs are provided for reference censusdp1tract: ZenodoDoi = "10.5281/zenodo.4127049" - # censusdp1tract: ZenodoDoi = "10.5072/zenodo.674992" eia860: ZenodoDoi = "10.5281/zenodo.10067566" - # eia860: ZenodoDoi = "10.5072/zenodo.1222854" eia860m: ZenodoDoi = "10.5281/zenodo.8188017" - # eia860m: ZenodoDoi = "10.5072/zenodo.1225517" eia861: ZenodoDoi = "10.5281/zenodo.10093091" - # eia861: ZenodoDoi = "10.5072/zenodo.1229930" - # eia923: ZenodoDoi = "10.5281/zenodo.8172818" eia923: ZenodoDoi = "10.5281/zenodo.10067550" eia_bulk_elec: ZenodoDoi = "10.5281/zenodo.7067367" - # eia_bulk_elec: ZenodoDoi = "10.5072/zenodo.1103572" epacamd_eia: ZenodoDoi = "10.5281/zenodo.7900974" - # epacamd_eia: ZenodoDoi = "10.5072/zenodo.1199170" epacems: ZenodoDoi = "10.5281/zenodo.8235497" - # epacems: ZenodoDoi = "10.5072/zenodo.1228519" ferc1: ZenodoDoi = "10.5281/zenodo.8326634" - # ferc1: ZenodoDoi = "10.5072/zenodo.1234455" ferc2: ZenodoDoi = "10.5281/zenodo.8326697" - # ferc2: ZenodoDoi = "10.5072/zenodo.1236695" ferc6: ZenodoDoi = "10.5281/zenodo.8326696" - # ferc6: ZenodoDoi = "10.5072/zenodo.1236703" ferc60: ZenodoDoi = "10.5281/zenodo.8326695" - # ferc60: ZenodoDoi = "10.5072/zenodo.1236694" ferc714: ZenodoDoi = "10.5281/zenodo.8326694" - # ferc714: ZenodoDoi = "10.5072/zenodo.1237565" phmsagas: ZenodoDoi = "10.5281/zenodo.8346646" - # phmsagas: ZenodoDoi = "10.5072/zenodo.1239253" class Config: """Pydantic config, reads from .env file.""" From cdd4bf52c15ca111071054f1c48bec350444cf26 Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Mon, 27 Nov 2023 14:21:17 -0300 Subject: [PATCH 06/12] Update minmax rows for new EIA923 data --- test/validate/eia_test.py | 16 ++++++++-------- test/validate/mcoe_test.py | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/test/validate/eia_test.py b/test/validate/eia_test.py index 2201ef4ac0..3d9743e4dd 100644 --- a/test/validate/eia_test.py +++ b/test/validate/eia_test.py @@ -45,15 +45,15 @@ def test_no_null_cols_eia(pudl_out_eia, live_dbs, cols, df_name): @pytest.mark.parametrize( "df_name,raw_rows,monthly_rows,annual_rows", [ - ("bf_eia923", 1_559_257, 1_559_257, 127_412), - ("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_179_377, 433_332), - ("gens_eia860", 556_948, 556_948, 556_948), - ("gf_eia923", 2_879_884, 2_879_884, 244_795), + ("bf_eia923", 1_569_568, 1_569_568, 128_252), + ("bga_eia860", 142_391, 142_391, 142_391), + ("boil_eia860", 83_416, 83_416, 83_416), + ("frc_eia923", 646_677, 264_043, 25_443), + ("gen_eia923", None, 5_179_478, 433_336), + ("gens_eia860", 556_949, 556_949, 556_949), + ("gf_eia923", 2_907_735, 2_907_735, 246_324), ("own_eia860", 89_741, 89_741, 89_741), - ("plants_eia860", 200_514, 200_514, 200_514), + ("plants_eia860", 200_511, 200_511, 200_511), ("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), diff --git a/test/validate/mcoe_test.py b/test/validate/mcoe_test.py index b1efd9c982..4d3e845b73 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_670, 32_414), - ("hr_by_gen", 599_496, 50_070), - ("fuel_cost", 599_496, 50_070), - ("capacity_factor", 5_179_377, 433_332), - ("mcoe", 5_179_785, 433_366), + ("hr_by_unit", 389_530, 32_569), + ("hr_by_gen", 602_580, 50_327), + ("fuel_cost", 602_580, 50_327), + ("capacity_factor", 5_179_478, 433_336), + ("mcoe", 5_179_886, 433_370), ], ) def test_minmax_rows_mcoe(pudl_out_mcoe, live_dbs, monthly_rows, annual_rows, df_name): From 741f2dd8fdfbcda5c334a089e0cef71f80cc7746 Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Mon, 27 Nov 2023 15:38:41 -0300 Subject: [PATCH 07/12] Remove ref: env.GITHUB_REF in zenodo-cache-sync to avoid errors related to recieving pushes from forked repos --- .github/workflows/zenodo-cache-sync.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/zenodo-cache-sync.yml b/.github/workflows/zenodo-cache-sync.yml index 10564ede56..22da3fa684 100644 --- a/.github/workflows/zenodo-cache-sync.yml +++ b/.github/workflows/zenodo-cache-sync.yml @@ -41,8 +41,6 @@ jobs: - name: Checkout desired branch uses: actions/checkout@v4 - with: - ref: ${{ env.GITHUB_REF }} - name: Install Conda environment using mamba uses: mamba-org/setup-micromamba@v1 From 49dcd1c9c8d4a707a69857726138c7d397f5a45f Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Mon, 27 Nov 2023 16:24:05 -0300 Subject: [PATCH 08/12] Add release notes note about 923 final release and quarterly update --- docs/release_notes.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/release_notes.rst b/docs/release_notes.rst index 2f3c936634..5173f35357 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -72,8 +72,8 @@ Data Coverage * Updated :doc:`data_sources/eia860` to include final release data from 2022. * Updated :doc:`data_sources/eia861` 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/eia923` to include final release data from 2022 and + monthly YTD data as of October 2023. * Updated :doc:`data_sources/epacems` to switch from the old FTP server to the new CAMPD API, and to include 2022 data. Due to changes in the ETL, Alaska, Puerto Rico and Hawaii are now included in CEMS processing. See issue :issue:`1264` & PRs From 3a7bfa6e68dd0ef97dceaf1dcd1e1bad484965bb Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Mon, 27 Nov 2023 19:06:35 -0300 Subject: [PATCH 09/12] Fix merge failure with dev --- src/pudl/workspace/datastore.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index 7683e9fcef..a85db32660 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -168,8 +168,8 @@ class ZenodoDoiSettings(BaseSettings): censusdp1tract: ZenodoDoi = "10.5281/zenodo.4127049" eia860: ZenodoDoi = "10.5281/zenodo.10067566" - eia860m: ZenodoDoi = "10.5281/zenodo.8188017" - eia861: ZenodoDoi = "10.5281/zenodo.10093091" + eia860m: ZenodoDoi = "10.5281/zenodo.10204686" + eia861: ZenodoDoi = "10.5281/zenodo.10204708" eia923: ZenodoDoi = "10.5281/zenodo.10067550" eia_bulk_elec: ZenodoDoi = "10.5281/zenodo.7067367" epacamd_eia: ZenodoDoi = "10.5281/zenodo.7900974" From f0ec29bf57f5f4588eb09dead21a5ebd04a9384f Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 17:41:33 +0000 Subject: [PATCH 10/12] [pre-commit.ci] auto fixes from pre-commit.com hooks For more information, see https://pre-commit.ci --- src/pudl/workspace/datastore.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pudl/workspace/datastore.py b/src/pudl/workspace/datastore.py index c78e9fa217..e1043945a0 100644 --- a/src/pudl/workspace/datastore.py +++ b/src/pudl/workspace/datastore.py @@ -186,6 +186,7 @@ class ZenodoDoiSettings(BaseSettings): phmsagas: ZenodoDoi = "10.5281/zenodo.8346646" model_config = SettingsConfigDict(env_prefix="pudl_zenodo_doi_", env_file=".env") + class ZenodoFetcher: """API for fetching datapackage descriptors and resource contents from zenodo.""" From 855b701b5e7e03176b3cb96ea8a4604d5bd0b32c Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Tue, 28 Nov 2023 23:25:57 -0300 Subject: [PATCH 11/12] Update references to years of EIA923 data ingested by PUDL. Also update the 923 data sources page to say that we do ingest the monthly data. --- README.rst | 8 ++++---- docs/templates/eia923_child.rst.jinja | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 8eea0e93b4..1b194c859a 100644 --- a/README.rst +++ b/README.rst @@ -52,11 +52,11 @@ What data is available? PUDL currently integrates data from: -* `EIA Form 860 `__: 2001-2022 +* `EIA Form 860 `__: 2001 - 2022 * `EIA Form 860m `__: 2023-06 -* `EIA Form 861 `__: 2001-2022 -* `EIA Form 923 `__: 2001-2022 -* `EPA Continuous Emissions Monitoring System (CEMS) `__: 1995-2022 +* `EIA Form 861 `__: 2001 - 2022 +* `EIA Form 923 `__: 2001 - 2023-10 +* `EPA Continuous Emissions Monitoring System (CEMS) `__: 1995 - 2022 * `FERC Form 1 `__: 1994-2021 * `FERC Form 714 `__: 2006-2020 * `US Census Demographic Profile 1 Geodatabase `__: 2010 diff --git a/docs/templates/eia923_child.rst.jinja b/docs/templates/eia923_child.rst.jinja index af6bca536a..7f04f7b12f 100644 --- a/docs/templates/eia923_child.rst.jinja +++ b/docs/templates/eia923_child.rst.jinja @@ -35,7 +35,8 @@ in `EIA Form 423 replaced the earlier FERC Form 423). If you're interested in this earlier data, get in touch with us! -Monthly interim EIA-923 data releases are not yet integrated into PUDL. In addition, We +Monthly interim EIA-923 data are periodically integrated into PUDL as well. Incomplete +year-to-date data are excluded from the annualized tables to avoid confusion. We have not yet integrated tables reporting fuel stocks, data from Puerto Rico, or EIA-923 schedules 6, 7, and 8. {% endblock %} From b29c0421662f045e50c017e7d1211bb03313f6a3 Mon Sep 17 00:00:00 2001 From: Austen Sharpe Date: Tue, 28 Nov 2023 23:44:49 -0300 Subject: [PATCH 12/12] Fix the month included in the EIA923 data years in the README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1b194c859a..f56642a3af 100644 --- a/README.rst +++ b/README.rst @@ -55,7 +55,7 @@ PUDL currently integrates data from: * `EIA Form 860 `__: 2001 - 2022 * `EIA Form 860m `__: 2023-06 * `EIA Form 861 `__: 2001 - 2022 -* `EIA Form 923 `__: 2001 - 2023-10 +* `EIA Form 923 `__: 2001 - 2023-08 * `EPA Continuous Emissions Monitoring System (CEMS) `__: 1995 - 2022 * `FERC Form 1 `__: 1994-2021 * `FERC Form 714 `__: 2006-2020