Skip to content

Commit 99955a8

Browse files
aesharpeaesharpe
committed
Merge branch 'rus12-transform-3' of https://github.com/catalyst-cooperative/pudl into rus12-transform-3
2 parents b89de2e + b3b44a8 commit 99955a8

File tree

14 files changed

+42
-10
lines changed

14 files changed

+42
-10
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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,8 @@ core_eia176__yearly_gas_disposition,2019,2032
436436
core_eia176__yearly_gas_disposition,2020,2058
437437
core_eia176__yearly_gas_disposition,2021,2016
438438
core_eia176__yearly_gas_disposition,2022,2029
439-
core_eia176__yearly_gas_disposition,2023,2061
439+
core_eia176__yearly_gas_disposition,2023,2077
440+
core_eia176__yearly_gas_disposition,2024,2075
440441
core_eia176__yearly_gas_disposition_by_consumer,1997,4338
441442
core_eia176__yearly_gas_disposition_by_consumer,1998,4280
442443
core_eia176__yearly_gas_disposition_by_consumer,1999,4410
@@ -463,7 +464,8 @@ core_eia176__yearly_gas_disposition_by_consumer,2019,4774
463464
core_eia176__yearly_gas_disposition_by_consumer,2020,4810
464465
core_eia176__yearly_gas_disposition_by_consumer,2021,4749
465466
core_eia176__yearly_gas_disposition_by_consumer,2022,4735
466-
core_eia176__yearly_gas_disposition_by_consumer,2023,4716
467+
core_eia176__yearly_gas_disposition_by_consumer,2023,4737
468+
core_eia176__yearly_gas_disposition_by_consumer,2024,4694
467469
core_eia860__assn_boiler_cooling,2009,2586
468470
core_eia860__assn_boiler_cooling,2010,2834
469471
core_eia860__assn_boiler_cooling,2011,2963

‎docs/dev/existing_data_updates.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ EIA 930
5454
* Updated EIA 930 data through December 2025. See :issue:`4985`
5555
and :pr:`4995`.
5656

57+
EIA 176
58+
~~~~~~~
59+
60+
* Updated EIA 176 data through 2024. See :issue:`5000` and :pr:`5005`.
5761

5862
Documentation
5963
~~~~~~~~~~~~~

‎src/pudl/metadata/sources.py‎

Lines changed: 1 addition & 1 deletion
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(

‎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)