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

Dev -> Main sync #3032

Merged
merged 65 commits into from
Nov 9, 2023
Merged

Dev -> Main sync #3032

merged 65 commits into from
Nov 9, 2023

Conversation

jdangerx
Copy link
Member

@jdangerx jdangerx commented Nov 9, 2023

As far as I can tell, this consists of:

  • EIA923m data maturity
  • Cloud SQL / postgres for nightly build Dagster state DB
  • Test fixes for non-deterministic failures
  • docs updates
  • FERC 714 report date fix
  • sundry validation test fixes
  • deploy datasette to fly.io

We need to sync dev to main, because that's nice to do, but also because the build-deploy-pudl.yaml has changed and we need to make sure that the scheduled runs work off of the new build-deploy-pudl.yaml.

aesharpe and others added 30 commits October 12, 2023 10:09
…e EIA data. This includes updating the package data to account for the 2023 year and updating the way to assign data maturities to 923 data. This also updates some of the expected row counts for the data. It should still fail on the gen_eia923 table because the row count was going down which doesn't seem right. There are also some failures related to check_date_freq as there are now less than 12 months expected in a given round of updates. Will handle those errors in another commit.
…move double returns from the drop_ytd_for_annual_tables function
- Add a note about how the plants are getting dropped in the gen_eia923 output table and link to the issue.

- Update the way we tell whether an EIA923 filing is monthly or annual based on feedback in the PR
… of EIA923 and EIA860 data. This is causing issues for the monthly EIA923 data that gets integrated ahead of any available 860 data. This might cause issues elsewhere which is why I haven't committed to fully deleting it yet.
- Restructure the way that the data_maturity field is dropped from certain tables when merging multiple tables together that each have that field. Previously it was ad-hoc, now it just gets dropped in the denorm_by_plant function.

- This also entails changing how the data_maturity field gets passed through to the agg tables: adds the data_maturity field to the agg function, selecting the 'first' instance of the data_maturity per agg because the fields are aggregated by date which is how data_maturity is determined. The annual aggregations drop the ytd rows before the aggregation happens so taking the first data_maturity value per year works in this case.

- Remove some comment fields

- Add new migration
… tests so that they aren't dependent on having the same years of EIA923 and EIA860 data
e-belfer and others added 27 commits November 2, 2023 15:05
Update sources, DOI and copyright link in PUDL
)

* Switch regex strategy to sampling strategy to improve performance

* Increase deadline
add alembic migration for the report_date non-null constraint that was recently added
…gres

Set up Cloud SQL Postgres database for dagster storage
Updates the requirements on [responses](https://github.com/getsentry/responses) to permit the latest version.
- [Release notes](https://github.com/getsentry/responses/releases)
- [Changelog](https://github.com/getsentry/responses/blob/master/CHANGES)
- [Commits](getsentry/responses@0.14.0...0.24.0)

---
updated-dependencies:
- dependency-name: responses
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Updates the requirements on [pyarrow](https://github.com/apache/arrow) to permit the latest version.
- [Commits](apache/arrow@go/v13.0.0...go/v14.0.0)

---
updated-dependencies:
- dependency-name: pyarrow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Updates the requirements on [dagster-postgres](https://github.com/dagster-io/dagster) to permit the latest version.
- [Release notes](https://github.com/dagster-io/dagster/releases)
- [Changelog](https://github.com/dagster-io/dagster/blob/master/CHANGES.md)
- [Commits](https://github.com/dagster-io/dagster/commits)

---
updated-dependencies:
- dependency-name: dagster-postgres
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
…/responses-gte-0.14-and-lt-0.25

Update responses requirement from <0.24,>=0.14 to >=0.14,<0.25
…/pyarrow-gte-13-and-lt-15

Update pyarrow requirement from <14,>=13 to >=13,<15
…/dagster-postgres-gte-0.21.5-and-lt-0.21.7

Update dagster-postgres requirement from <0.21.6,>=0.21.5 to >=0.21.5,<0.21.7
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.3 → v0.1.4](astral-sh/ruff-pre-commit@v0.1.3...v0.1.4)
…te-config

[pre-commit.ci] pre-commit autoupdate
…uency_code

only fix a reporting_frequency_code when the column exists
…te_fix

update excepted rows for no-fips id-ed respondents but keep annualize…
…at_nan

Fix validation `test_fbp_ferc1_mismatched_fuels` error
* Try using datasette publish fly
* Pull run command into its own shell script; only deploy one dataset for iteration speed.
* Append publishing logs to the logfile as well
In preparation for merge from `dev` into `main`
Copy link

codecov bot commented Nov 9, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c831080) 88.6% compared to head (1bb33dd) 88.7%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@          Coverage Diff          @@
##            main   #3032   +/-   ##
=====================================
  Coverage   88.6%   88.7%           
=====================================
  Files         91      90    -1     
  Lines      10991   10988    -3     
=====================================
+ Hits        9749    9752    +3     
+ Misses      1242    1236    -6     
Files Coverage Δ
src/pudl/analysis/allocate_gen_fuel.py 91.3% <ø> (ø)
src/pudl/analysis/classify_plants_ferc1.py 92.5% <100.0%> (+<0.1%) ⬆️
src/pudl/extract/eia923.py 100.0% <100.0%> (ø)
src/pudl/extract/excel.py 96.3% <100.0%> (-0.5%) ⬇️
src/pudl/metadata/classes.py 86.6% <100.0%> (+0.1%) ⬆️
src/pudl/metadata/constants.py 100.0% <ø> (ø)
src/pudl/metadata/fields.py 100.0% <ø> (ø)
src/pudl/metadata/resources/eia.py 100.0% <ø> (ø)
src/pudl/metadata/resources/eia923.py 100.0% <ø> (ø)
src/pudl/metadata/sources.py 100.0% <ø> (ø)
... and 9 more

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

Copy link
Member

@cmgosnell cmgosnell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all these things look like the things we've been working on/already have been reviewed by folks. nothing looks out of place to me (even though some of it is a lil over my 🗣️ )!

@jdangerx jdangerx merged commit b783809 into main Nov 9, 2023
11 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.

7 participants