Skip to content

Commit f9fc69d

Browse files
authored
Merge branch 'main' into pre-commit-ci-update-config
2 parents 3fb4159 + 4677d8d commit f9fc69d

30 files changed

+17511
-17428
lines changed

.github/ISSUE_TEMPLATE/existing_data_updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: Integrate New Year of Data
33
about: Check-list for integrating a new year of data
44
title: ""
5-
labels: new-data
5+
labels: data-update
66
assignees: ""
77
---
88

.github/workflows/deploy-pudl.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: deploy-pudl
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
deploy_pudl:
8+
name: Deploy PUDL build
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: stub
12+
run: echo 'stub'

dbt/seeds/etl_full_row_counts.csv

Lines changed: 76 additions & 74 deletions
Large diffs are not rendered by default.

docs/dev/existing_data_updates.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ archivers themselves.
4646

4747
**1.2)** Obtain production DOIs from
4848
`Zenodo <https://zenodo.org/communities/catalyst-cooperative/>`__ and then update the
49-
dictionary of in :mod:`pudl.workspace.datastore` to refer to the new raw input
50-
archives.
49+
record in :mod:`pudl.package_data.settings.zenodo_dois.yml` to refer to the new raw
50+
input archives.
5151

5252
**1.3)** In :py:const:`pudl.metadata.sources.SOURCES`, update the ``working_partitions``
5353
to reflect the years, months, or quarters of data that are available for each dataset
@@ -92,10 +92,10 @@ the years (e.g. ``boiler_fuel``). However ``page_name`` does not necessarily cor
9292
directly to PUDL database table names because we don't load the data from all pages, and
9393
some pages result in more than one database table after normalization.
9494

95-
**2.A.1)** If you're adding a new year, add a column for the new year of data to
95+
**2.A.1)** If you're adding a new year, add a row for the new year of data to
9696
each of the aforementioned files. If there are any changes to prior years, make
9797
sure to address those too. If you are updating early release data with final
98-
release data, replace the values in the appropriate year column. **The easiest way
98+
release data, replace the values in the appropriate year row. **The easiest way
9999
to correct the values for these files is to test extraction in Dagster as
100100
described in the next step, then use the error messages to narrow down what should
101101
be updated.** Exhaustively examining each file manually to compare it with its

docs/release_notes.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,28 @@ EPA CEMS
4848
* Updated EPA CEMS hourly emissions data through December 2025. See :issue:`4986`
4949
and :pr:`4990`.
5050

51+
EIA-860M
52+
~~~~~~~~
53+
54+
* Updated EIA-860M with monthly data through December 2025. See :issue:`4983` and
55+
:pr:`4993`.
56+
57+
EIA-923
58+
~~~~~~~
59+
60+
* Updated EIA-923 with monthly data through November 2025. See :issue:`4984` and
61+
:pr:`4993`.
62+
5163
EIA 930
5264
~~~~~~~
5365

5466
* Updated EIA 930 data through December 2025. See :issue:`4985`
5567
and :pr:`4995`.
5668

69+
EIA 176
70+
~~~~~~~
71+
72+
* Updated EIA 176 data through 2024. See :issue:`5000` and :pr:`5005`.
5773

5874
Documentation
5975
~~~~~~~~~~~~~

src/pudl/metadata/sources.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
),
7474
"source_format": "Comma Separated Value (.csv)",
7575
},
76-
"working_partitions": {"years": sorted(set(range(1997, 2024)))},
76+
"working_partitions": {"years": sorted(set(range(1997, 2025)))},
7777
"contributors": [CONTRIBUTORS["catalyst-cooperative"]],
7878
"keywords": sorted(
7979
set(
@@ -207,7 +207,7 @@
207207
"working_partitions": {
208208
"year_months": [
209209
str(q).lower()
210-
for q in pd.period_range(start="2015-07", end="2025-11", freq="M")
210+
for q in pd.period_range(start="2015-07", end="2025-12", freq="M")
211211
],
212212
},
213213
"keywords": sorted(

src/pudl/package_data/eia176/column_maps/company_list.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ year_index,operating_state,operator_id_eia,operator_name,operator_status,report_
2626
2021,report_state,id,company_name,status,last_update
2727
2022,report_state,id,company_name,status,last_update
2828
2023,report_state,id,company_name,status,last_update
29+
2024,report_state,id,company_name,status,last_update

src/pudl/package_data/eia176/column_maps/continuation_text_lines.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ year_index,operating_state,reference_state,operator_id_eia,operator_name,report_
2626
2021,report_state,ref_state,company_id,company_name,year,survey_line,survey_line_description,volume_mcf,reference_company_or__line_description,mode_of__transportation
2727
2022,report_state,ref_state,company_id,company_name,year,survey_line,survey_line_description,volume_mcf,reference_company_or__line_description,mode_of__transportation
2828
2023,report_state,ref_state,company_id,company_name,year,survey_line,survey_line_description,volume_mcf,reference_company_or__line_description,mode_of__transportation
29+
2024,report_state,ref_state,company_id,company_name,year,survey_line,survey_line_description,volume_mcf,reference_company_or__line_description,mode_of__transportation

src/pudl/package_data/eia176/column_maps/custom.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ year_index,operator_name,operating_state,value,variable_name,form_line_numbers,o
2626
2021,company,area,value,item,itemsort,id,line,atype
2727
2022,company,area,value,item,itemsort,id,line,atype
2828
2023,company,area,value,item,itemsort,id,line,atype
29+
2024,company,area,value,item,itemsort,id,line,atype

src/pudl/package_data/eia176/column_maps/type_of_operations_and_sector_items.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ year_index,report_year,operating_state,operator_id_eia,operator_name,is_distribu
2626
2021,year,state,company,company_name,cooperative,residential_total_volume_mcf,residential_sales_volume_mcf,residential_sales_price_dollars,residential_transported_price_dollars,residential_sales_revenue_dollars,residential_total_customers,residential_sales_customers,commercial_total_volume_mcf,commercial_sales_volume_mcf,commercial_sales_price_dollars,commercial_transported_price_dollars,commercial_sales_revenue_dollars,commercial_total_customers,commercial_sales_customers,industrial_sales_price_dollars,industrial_transported_price_dollars,industrial_total_customers,electric_total_volume_mcf,electric_sales_volume_mcf,electric_sales_price_dollars,electric_transported_price_dollars,electric_sales_revenue_dollars,electric_total_customers,electric_sales_customers,vehicle_fuel_sales_price_dollars,vehicle_fuel_transported_price_dollars,vehicle_fuel_total_customers,intrastate,producer,gatherer,privately_owned,losses_from_leaks_etc_within_state_mcf,industrial_total_volume_mcf,industrial_sales_volume_mcf,industrial_sales_revenue_dollars,industrial_sales_customers,electric_transported_volume_mcf,electric_transported_revenue_dollars,electric_transported_customers,storage_operator,industrial_transported_volume_mcf,industrial_transported_customers,investor_owned,commercial_transported_volume_mcf,commercial_transported_revenue_dollars,commercial_transported_customers,municipally_owned,interstate,lng_operator,cng_public,industrial_transported_revenue_dollars,vehicle_fuel_sales_revenue_dollars,vehicle_fuel_sales_customers,vehicle_fuel_total_volume_mcf,vehicle_fuel_sales_volume_mcf,vehicle_fuel_transported_volume_mcf,vehicle_fuel_transported_revenue_dollars,vehicle_fuel_transported_customers,other_ownership,,lng_public,other_descr,residential_transported_volume_mcf,residential_transported_customers,residential_transported_revenue_dollars,sng_operator,lng_marine_terminal
2727
2022,year,state,company,company_name,cooperative,residential_total_volume_mcf,residential_sales_volume_mcf,residential_sales_price_dollars,residential_transported_price_dollars,residential_sales_revenue_dollars,residential_total_customers,residential_sales_customers,commercial_total_volume_mcf,commercial_sales_volume_mcf,commercial_sales_price_dollars,commercial_transported_price_dollars,commercial_sales_revenue_dollars,commercial_total_customers,commercial_sales_customers,industrial_sales_price_dollars,industrial_transported_price_dollars,industrial_total_customers,electric_total_volume_mcf,electric_sales_volume_mcf,electric_sales_price_dollars,electric_transported_price_dollars,electric_sales_revenue_dollars,electric_total_customers,electric_sales_customers,vehicle_fuel_sales_price_dollars,vehicle_fuel_transported_price_dollars,vehicle_fuel_total_customers,intrastate,producer,gatherer,privately_owned,losses_from_leaks_etc_within_state_mcf,industrial_total_volume_mcf,industrial_sales_volume_mcf,industrial_sales_revenue_dollars,industrial_sales_customers,electric_transported_volume_mcf,electric_transported_revenue_dollars,electric_transported_customers,storage_operator,industrial_transported_volume_mcf,industrial_transported_customers,investor_owned,commercial_transported_volume_mcf,commercial_transported_revenue_dollars,commercial_transported_customers,municipally_owned,interstate,lng_operator,cng_public,industrial_transported_revenue_dollars,vehicle_fuel_sales_revenue_dollars,vehicle_fuel_sales_customers,vehicle_fuel_total_volume_mcf,vehicle_fuel_sales_volume_mcf,vehicle_fuel_transported_volume_mcf,vehicle_fuel_transported_revenue_dollars,vehicle_fuel_transported_customers,other_ownership,,lng_public,other_descr,residential_transported_volume_mcf,residential_transported_customers,residential_transported_revenue_dollars,sng_operator,lng_marine_terminal
2828
2023,year,state,company,company_name,cooperative,residential_total_volume_mcf,residential_sales_volume_mcf,residential_sales_price_dollars,residential_transported_price_dollars,residential_sales_revenue_dollars,residential_total_customers,residential_sales_customers,commercial_total_volume_mcf,commercial_sales_volume_mcf,commercial_sales_price_dollars,commercial_transported_price_dollars,commercial_sales_revenue_dollars,commercial_total_customers,commercial_sales_customers,industrial_sales_price_dollars,industrial_transported_price_dollars,industrial_total_customers,electric_total_volume_mcf,electric_sales_volume_mcf,electric_sales_price_dollars,electric_transported_price_dollars,electric_sales_revenue_dollars,electric_total_customers,electric_sales_customers,vehicle_fuel_sales_price_dollars,vehicle_fuel_transported_price_dollars,vehicle_fuel_total_customers,intrastate,producer,gatherer,privately_owned,losses_from_leaks_etc_within_state_mcf,industrial_total_volume_mcf,industrial_sales_volume_mcf,industrial_sales_revenue_dollars,industrial_sales_customers,electric_transported_volume_mcf,electric_transported_revenue_dollars,electric_transported_customers,storage_operator,industrial_transported_volume_mcf,industrial_transported_customers,investor_owned,commercial_transported_volume_mcf,commercial_transported_revenue_dollars,commercial_transported_customers,municipally_owned,interstate,lng_operator,cng_public,industrial_transported_revenue_dollars,vehicle_fuel_sales_revenue_dollars,vehicle_fuel_sales_customers,vehicle_fuel_total_volume_mcf,vehicle_fuel_sales_volume_mcf,vehicle_fuel_transported_volume_mcf,vehicle_fuel_transported_revenue_dollars,vehicle_fuel_transported_customers,other_ownership,,lng_public,other_descr,residential_transported_volume_mcf,residential_transported_customers,residential_transported_revenue_dollars,sng_operator,lng_marine_terminal
29+
2024,year,state,company,company_name,cooperative,residential_total_volume_mcf,residential_sales_volume_mcf,residential_sales_price_dollars,residential_transported_price_dollars,residential_sales_revenue_dollars,residential_total_customers,residential_sales_customers,commercial_total_volume_mcf,commercial_sales_volume_mcf,commercial_sales_price_dollars,commercial_transported_price_dollars,commercial_sales_revenue_dollars,commercial_total_customers,commercial_sales_customers,industrial_sales_price_dollars,industrial_transported_price_dollars,industrial_total_customers,electric_total_volume_mcf,electric_sales_volume_mcf,electric_sales_price_dollars,electric_transported_price_dollars,electric_sales_revenue_dollars,electric_total_customers,electric_sales_customers,vehicle_fuel_sales_price_dollars,vehicle_fuel_transported_price_dollars,vehicle_fuel_total_customers,intrastate,producer,gatherer,privately_owned,losses_from_leaks_etc_within_state_mcf,industrial_total_volume_mcf,industrial_sales_volume_mcf,industrial_sales_revenue_dollars,industrial_sales_customers,electric_transported_volume_mcf,electric_transported_revenue_dollars,electric_transported_customers,storage_operator,industrial_transported_volume_mcf,industrial_transported_customers,investor_owned,commercial_transported_volume_mcf,commercial_transported_revenue_dollars,commercial_transported_customers,municipally_owned,interstate,lng_operator,cng_public,industrial_transported_revenue_dollars,vehicle_fuel_sales_revenue_dollars,vehicle_fuel_sales_customers,vehicle_fuel_total_volume_mcf,vehicle_fuel_sales_volume_mcf,vehicle_fuel_transported_volume_mcf,vehicle_fuel_transported_revenue_dollars,vehicle_fuel_transported_customers,other_ownership,,lng_public,other_descr,residential_transported_volume_mcf,residential_transported_customers,residential_transported_revenue_dollars,sng_operator,lng_marine_terminal

0 commit comments

Comments
 (0)