-
-
Notifications
You must be signed in to change notification settings - Fork 119
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Feature branch: Rename core + output assets to match new naming protocols #2818
Merged
Merged
Changes from 11 commits
Commits
Show all changes
111 commits
Select commit
Hold shift + click to select a range
e0ed4f2
Rename static tables
e-belfer 5f815b3
Rename Census DP1 assets
e-belfer 8da9db6
Test doc fix
e-belfer bb75aa1
Update core table names for EIA 860, 923, harvested tables, FERC1, code
e-belfer 2bb53f5
Fix integration tests
e-belfer 0cd5e9d
Fix alembic
e-belfer 8790131
Rename 714, 861, epacems
e-belfer b851fe7
update tests and rest of assets
e-belfer 9d7996d
Resolve merge conflict
e-belfer 2232577
Fix validation tests
e-belfer 7e7303a
Rename ferc output assets
bendnorman 2fcf9f1
Merge branch 'rename-core-assets' into rename-ferc-output-assets
bendnorman 2ee75b2
Rename denorm_cash_flow_ferc1 and remove leading underscore from cros…
bendnorman ec426d6
Merge branch 'dev' into rename-core-assets
e-belfer ada8b01
Rename a missing ferc output table and add migration
bendnorman 3417344
Merge branch 'rename-core-assets' into rename-ferc-output-assets
e-belfer 62f0f50
Rename EIA denorm assets
bendnorman 00ce1e9
Recreate ferc rename migration
bendnorman 34dba80
Add docs cross ref fix for intermediate assets
bendnorman ac79bd5
Resolve small denorm EIA rename issues
bendnorman ce16bbd
Clean up notebooks
e-belfer 8a4e6ea
Apply naming convention to allocate generation fuel assets
bendnorman 0a912e4
Merge pull request #2856 from catalyst-cooperative/rename-ferc-output…
bendnorman 6b14304
Fix a missing gen fuel asset name in PudlTabl
bendnorman 325fb52
Merge branch 'rename-core-assets' into rename-eia-output-assets
bendnorman a2042de
Update migrations post ferc1 output rename merge
bendnorman 8b468db
Merge pull request #2858 from catalyst-cooperative/rename-eia-output-…
bendnorman 5f182f9
Merge branch 'rename-core-assets' into rename-allocate-gen-fuel-assets
e-belfer 77a16f5
Update contributor facing documentation with new asset naming convent…
bendnorman 4d5b57d
Add new naming convention to user facing documentation
bendnorman efb2bbd
Correct allocate-get-fuel down revision
bendnorman 239eb4d
Apply new naming convention to ferc714 respondents, hourly demand and…
bendnorman 09a876d
Merge pull request #2865 from catalyst-cooperative/rename-allocate-ge…
e-belfer 5ebedcd
Fix refs to renamed tables in release notes
bendnorman 6ffe6a5
Rename ferc714 and eia861 output tables in integration tests
bendnorman d257e52
Merge branch 'rename-core-assets' into rename-annualized-respondents-…
e-belfer 97149cb
Add missing balance authority fk migration
bendnorman 6a5411a
Rename out_ferc714__fipsified_respondents to out_ferc714__respondents…
bendnorman 4d256ec
Respond to first round of Austen's comments
bendnorman 9d30977
Merge pull request #2882 from catalyst-cooperative/rename-annualized-…
bendnorman ef4b5ad
Merge branch 'rename-core-assets' into create-naming-convention-docs
bendnorman 1a9028d
Update rename-core-assets and clarify raw asset sentence
bendnorman 32dc9ac
Restrict astroid version to avoid random autoapi error
bendnorman ee23cba
Merge branch 'dev' into rename-core-assets
bendnorman d8884c2
Merge branch 'dev' into rename-core-assets
bendnorman 765c420
Reset migrations and fix old table refs in docs
bendnorman 7a7a441
Fix names of inputs to exploded tables and xbrl calculation fixes
bendnorman 1aa5116
Rename mcoe and ppl assets
bendnorman 01d3c73
Merge branch 'rename-core-assets' into rename-mcoe-assets
bendnorman f231452
Fix small ppl migration issue
bendnorman 7b7dba1
Format and sort intermediate resource name cross refs in data dictionary
bendnorman 50cea89
Add upstream mcoe assets back to metadata
bendnorman 791a70b
Update stragler PudlTabl method name
bendnorman 9f578b3
Add frequency to ppl asset name and some clean up
bendnorman 1b5100e
Merge pull request #2904 from catalyst-cooperative/rename-mcoe-assets
bendnorman 8d2ab9a
Merge branch 'dev' into rename-core-assets
cmgosnell c63dd8f
rename six of the non-contreversial FERC1 tables (core + out)
cmgosnell e8db0ad
initial rename of the FERC1 core and out tables
cmgosnell bb088af
add db migration
cmgosnell 8d3b058
rename the ferc1 transformer classes in line with new table names
cmgosnell 797d40e
Merge branch 'rename-core-assets' into create-naming-convention-docs
bendnorman 33fab91
Incorporate some docs changes from #2912
bendnorman c5fb34f
FINAL FINAL rename of ferc assets
cmgosnell fc7de0e
ooooops remove the eia860m extraction edit bc that was not supposed t…
cmgosnell c2af359
Merge branch 'dev' into rename-core-assets
cmgosnell 50e3eef
Merge branch 'rename-core-assets' into create-naming-convention-docs
bendnorman 0c3b9ae
Merge pull request #2995 from catalyst-cooperative/rename-ferc1-assets
bendnorman 10111e4
Remove README.rst from index.rst and move intro content to index
bendnorman 85c6fe3
Add deprecation warnings to PudlTabl and add minor naming docs updates
bendnorman d61005d
Rename heat_rate_mmbtu_mwh -> heat_rate_mmbtu_mwh_by_unit
bendnorman 53e2f2d
Rename heat rate mmbtu mwh to follow existing naming convention
bendnorman 479ec7f
Remove PudlTabl removal data and make assn table name sources alphabe…
bendnorman c329804
Explain why CEMS is stored as parquet
bendnorman d8c01da
Rename heat_rate_mmbtu_mwh_eia/ferc1 columns to unit_heat_rate_mmbtu_…
bendnorman afaa449
Remove unused ppe_cols_to_grab variable
bendnorman 53d5618
Merge pull request #3028 from catalyst-cooperative/create-renaming-re…
bendnorman f60592f
Make association asset names more consistent
bendnorman cb9b188
Merge pull request #2874 from catalyst-cooperative/create-naming-conv…
bendnorman 19a9e7a
Merge branch 'rename-core-assets' into rename-assn-assets
bendnorman 1d2d71c
Add association assset naming convention to docs
bendnorman 0f90efa
Resolve migration issues with unit heat rate column
bendnorman 578a033
Merge pull request #3035 from catalyst-cooperative/rename-assn-assets
bendnorman 46a83b6
Merge branch 'dev' into rename-core-assets
bendnorman 4a2be6a
Update conda-lock.yml and rendered conda environment files.
bendnorman f82b56e
Merge branch 'rename-core-assets' into rename-heat-rate-mmbtu-mwh-column
bendnorman 7ef9c70
Recreate heat rate migration revision
bendnorman 1396ad8
Merge pull request #3029 from catalyst-cooperative/rename-heat-rate-m…
bendnorman 1e32e57
Merge branch 'dev' into rename-core-assets
bendnorman 0fb7b9f
Use pudl_sqlite_io_manager for fuel_cost_by_generator assets
bendnorman 3528935
Merge branch 'dev' into rename-core-assets
bendnorman 271ffc3
Update conda-lock.yml and rendered conda environment files.
bendnorman 9db6ec2
Checkout lock files from dev
bendnorman d27c0ca
Merge branch 'dev' into rename-core-assets
bendnorman 77712e6
Update conda-lock.yml and rendered conda environment files.
bendnorman f07f0a5
Merge branch 'dev' into rename-core-assets
bendnorman 3237907
Merge branch 'rename-core-assets' of github.com:catalyst-cooperative/…
bendnorman 1928c14
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 5e85257
Remove intro.rst and update ferc s3 urls again
bendnorman e86daad
Merge branch 'rename-core-assets' of github.com:catalyst-cooperative/…
bendnorman 68f2ec5
Merge branch 'dev' into rename-core-assets
bendnorman 24968f4
Update conda-lock.yml and rendered conda environment files.
bendnorman 41c4415
Merge branch 'dev' into rename-core-assets
bendnorman 660eaff
Remove some old table names from metaddata
bendnorman aaa99ee
Update conda-lock.yml and rendered conda environment files.
bendnorman e17bd42
Merge branch 'dev' into rename-core-assets
bendnorman 1ad3830
Merge branch 'rename-core-assets' of github.com:catalyst-cooperative/…
bendnorman be7e5c2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] 2414de7
Remove ref to non existant doc page, remove files no longer in dev
bendnorman 4ecfc86
Merge branch 'dev' into rename-core-assets
bendnorman 9f3d293
Merge branch 'dev' into rename-core-assets
bendnorman 9544618
Merge branch 'dev' into rename-core-assets
bendnorman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -109,7 +109,7 @@ | |
"@asset(io_manager_key=\"pudl_sqlite_io_manager\", compute_kind=\"Python\")\n", | ||
"def denorm_utilities_eia860(\n", | ||
" utilities_entity_eia: pd.DataFrame,\n", | ||
" utilities_eia860: pd.DataFrame,\n", | ||
" core_eia860__scd_utilities: pd.DataFrame,\n", | ||
" utilities_eia: pd.DataFrame,\n", | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should |
||
"):\n", | ||
" ... # joining logic\n", | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file has been deleted from
dev
. Do we know why it's showing up here now?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah that is strange. I'll look into it.