Skip to content
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

Merge dev into main for 2023-12-13 #3153

Merged
merged 66 commits into from
Dec 13, 2023
Merged

Merge dev into main for 2023-12-13 #3153

merged 66 commits into from
Dec 13, 2023

Conversation

zaneselvans
Copy link
Member

  • WIP move to year-quarter partitions
  • WIP change extraction partitions and etl settings, fix unit tests
  • Update conda-lock.yml and rendered conda environment files.
  • Update integration tests to use quarter
  • Update DOI to production
  • Fix EPACEMS integration test
  • Update conda-lock.yml and rendered conda environment files.
  • Repartition row groups in monolith parquet, update integration test, fix typos
  • Drop year from fast ETL and add concurrency limiting
  • Update conda-lock.yml and rendered conda environment files.
  • Drop concurrency further and update integration test to use 2022 data
  • Update conda-lock.yml and rendered conda environment files.
  • point cems to a new (draft!) archive w/ year_quarter partitions
  • Update conda-lock.yml and rendered conda environment files.
  • Update conda-lock.yml and rendered conda environment files.
  • Update conda-lock.yml and rendered conda environment files.
  • Bump docker/metadata-action from 4.4.0 to 5.3.0
  • Bump actions/setup-python from 4 to 5
  • Bump google-github-actions/setup-gcloud from 1 to 2
  • Bump tibdex/github-app-token from 1 to 2
  • Update conda-lock.yml and rendered conda environment files.
  • Replace ferc714 @multi_asset with asset factory (Replace ferc714 @multi_asset with asset factory  #3123) for better subsetting functionality.
  • Update conda-lock.yml and rendered conda environment files.
  • [pre-commit.ci] pre-commit autoupdate
  • [pre-commit.ci] auto fixes from pre-commit.com hooks
  • Update .pre-commit-config.yaml
  • address pr concerns
  • Update conda-lock.yml and rendered conda environment files.
  • Update conda-lock.yml and rendered conda environment files.
  • add release notes for quarterly cems
  • Fix some comments/docstrings; clarify Zenodo RECID regex
  • Remove comment about epacems DOI being draft archive.
  • Adjust epacems output tests to reflect quarterly partitions.
  • add tests to cover a few uncovered lines
  • Table diff tools (Table diff tools #3128)
  • Refactor calculation of annualized_respondents_ferc714 (Refactor calculation of annualized_respondents_ferc714 #3024)
  • Update conda-lock.yml and rendered conda environment files.

e-belfer and others added 30 commits November 24, 2023 13:44
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 4.4.0 to 5.3.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](docker/metadata-action@v4.4.0...v5.3.0)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [google-github-actions/setup-gcloud](https://github.com/google-github-actions/setup-gcloud) from 1 to 2.
- [Release notes](https://github.com/google-github-actions/setup-gcloud/releases)
- [Changelog](https://github.com/google-github-actions/setup-gcloud/blob/main/CHANGELOG.md)
- [Commits](google-github-actions/setup-gcloud@v1...v2)

---
updated-dependencies:
- dependency-name: google-github-actions/setup-gcloud
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
pre-commit-ci bot and others added 26 commits December 11, 2023 19:55
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.6 → v0.1.7](astral-sh/ruff-pre-commit@v0.1.6...v0.1.7)
- [github.com/pre-commit/mirrors-prettier: v3.1.0 → v4.0.0-alpha.4](pre-commit/mirrors-prettier@v3.1.0...v4.0.0-alpha.4)
No alpha versions please.
WIP Transition CEMS paritions to `year_quarter` from `year` and `quarter`
…te-config

[pre-commit.ci] pre-commit autoupdate

Rejected the update to alpha version of prettier.
Update CEMS partitions to handle year-quarter files
* Diff tables' individual values instead of by row

* Add a simple notebook that actually runs some diffs.

* Add empty-case test + some docs in notebook.

---------

Co-authored-by: Zane Selvans <[email protected]>
* Refactor calculation of annualized_respondents_ferc714

Rather than loading huge demand_hourly_pa_ferc714 dataset and calculating
report_date columns from these, we can infer these values from the ferc714_settings.
Additionally, we can use cross product merge to blow out the respondents, rather
than doing the complex procedure that we did up to this point.

* Put back check that report_date is not in respondent_id_ferc714
* import dataset_settings resource into annualized_respondents_ferc714
* Update conda-lock.yml and rendered conda environment files.

---------

Co-authored-by: rousik <[email protected]>
Co-authored-by: Zane Selvans <[email protected]>
Co-authored-by: zaneselvans <[email protected]>
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

Copy link

codecov bot commented Dec 13, 2023

Codecov Report

Attention: 27 lines in your changes are missing coverage. Please review.

Comparison is base (60df4b1) 88.8% compared to head (0009827) 92.7%.
Report is 152 commits behind head on main.

Files Patch % Lines
src/pudl/ferc_to_sqlite/cli.py 63.6% 8 Missing ⚠️
src/pudl/etl/cli.py 66.7% 5 Missing ⚠️
src/pudl/helpers.py 80.8% 5 Missing ⚠️
src/pudl/convert/metadata_to_rst.py 69.2% 4 Missing ⚠️
src/pudl/analysis/service_territory.py 94.7% 2 Missing ⚠️
src/pudl/etl/check_foreign_keys.py 75.0% 2 Missing ⚠️
src/pudl/__main__.py 0.0% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            main   #3153     +/-   ##
=======================================
+ Coverage   88.8%   92.7%   +3.9%     
=======================================
  Files         89     134     +45     
  Lines      11023   12597   +1574     
=======================================
+ Hits        9785   11672   +1887     
+ Misses      1238     925    -313     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@zaneselvans zaneselvans merged commit 25c2ce7 into main Dec 13, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants