dev -> dagster-asset-etl merge
#2398
Merged
Conversation
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
Add EIA 860 EnviroAssoc/EnviroEquip boiler and emissions control attributes
Update `main` as the nightly builds on `dev` have succeeded.
Reorder PK of boilers_eia860 to group data like other tables
Fix Bandit issues
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2.4.1 to 2.5.0. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](docker/setup-buildx-action@v2.4.1...v2.5.0) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
Updates the requirements on [dask](https://github.com/dask/dask) to permit the latest version. - [Release notes](https://github.com/dask/dask/releases) - [Changelog](https://github.com/dask/dask/blob/main/docs/release-procedure.md) - [Commits](dask/dask@2021.08.0...2023.3.1) --- updated-dependencies: - dependency-name: dask dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>
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.23.1) --- updated-dependencies: - dependency-name: responses dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>
I made this name change because there's a directly analogous `electric_operating_revenues_ferc1` table that has also been integrated into PUDL, and the difference in naming made it less clear that they were a matched pair. We've also kept full names for pretty much all of the other FERC 1 tables. Closes #2370
…actions/dev/docker/setup-buildx-action-2.5.0 Bump docker/setup-buildx-action from 2.4.1 to 2.5.0
…/dask-gte-2021.8-and-lt-2023.3.2 Update dask requirement from <2023.3.1,>=2021.8 to >=2021.8,<2023.3.2
…/responses-gte-0.14-and-lt-0.24 Update responses requirement from <0.23,>=0.14 to >=0.14,<0.24
Move `--no-sign-request` to the end of the command in the nightly_data_build docs
jdangerx
requested review from
a team and
bendnorman
and removed request for
a team
…ex-table Rename electric_opex_ferc1 table electric_operating_expenses_ferc1
Codecov ReportPatch and project coverage have no change.
Additional details and impacted files@@ Coverage Diff @@
## dagster-asset-etl #2398 +/- ##
=================================================
Coverage 86.5% 86.6%
=================================================
Files 79 79
Lines 9520 9518 -2
=================================================
Hits 8243 8243
+ Misses 1277 1275 -2
... and 2 files with indirect coverage changes Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. ☔ View full report in Codecov by Sentry. |
updates: - [github.com/PyCQA/bandit: 1.7.4 → 1.7.5](PyCQA/bandit@1.7.4...1.7.5) - [github.com/rstcheck/rstcheck: v6.1.1 → v6.1.2](rstcheck/rstcheck@v6.1.1...v6.1.2)
…te-config [pre-commit.ci] pre-commit autoupdate
zaneselvans
approved these changes
Mar 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I made a new branch off of
dagster-asset-etland then mergeddevinto it. This is the result. After merging this intodagster-asset-etlI think we'll also need to separately mergedevintodagster-asset-etl. This should result in no changes, but tell Git that "yes, we did merge dev in".Conflicts resolved:
extract.ferc1.