-
-
Notifications
You must be signed in to change notification settings - Fork 120
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-11-21 #3070
Merged
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
Member
zaneselvans
commented
Nov 21, 2023
- spot fix for 2021 cliffside capacity
- Update conda-lock.yml and rendered conda environment files.
- When merging automaticlly use conda lockfiles from current branch.
- Update lockfiles just to make trouble.
- 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.
- Update conda-lock.yml and rendered conda environment files.
- Update conda-lock.yml and rendered conda environment files.
- Update PUDL to SQLAlchemy 2.0 (Update PUDL to SQLAlchemy 2.0 #2267)
- Update conda-lock.yml and rendered conda environment files.
- Update conda-lock.yml and rendered conda environment files. (Update Lockfile #3059)
- Update conda-lock.yml and rendered conda environment files.
- Pin conda-lock<2.5.0 (Pin conda-lock<2.5.0 #3063)
- Update conda-lock.yml and rendered conda environment files.
- Change lock file merge strategy to look for .yml instead of .yaml files (Change lock file merge strategy to look for .yml instead of .yaml files #3065)
- [pre-commit.ci] pre-commit autoupdate ([pre-commit.ci] pre-commit autoupdate #3062)
- Fix full build notification logic (Fix full build notification logic #3058)
- Unpin conda lock (Unpin conda lock #3069)
- Update conda-lock.yml and rendered conda environment files.
…-capacity Spot fix cliffside capacity
Always take lockfile version from current branch when merging
* Update PUDL to use SQLAlchemy 2.0 * Use replace engine.connect() with engine.begin() * Update unit tests to work with SQLAlchemy 2.0 * Require SQLAlchemy 2.0. Again. Oops. * Remove deprecated use_nullable_dtypes arg from read_parquet calls. * Use string 'sum' rather than callable sum() in groupby transforms. * Use explicit observed=True in timezone groupby * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: zaneselvans <[email protected]>
Co-authored-by: zaneselvans <[email protected]>
* Pin conda-lock<2.5.0 to avoid new bug. * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: zaneselvans <[email protected]>
* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.1.5 → v0.1.6](astral-sh/ruff-pre-commit@v0.1.5...v0.1.6) * Update conda-lock.yml and rendered conda environment files. * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: pre-commit-ci[bot] <pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Zane Selvans <[email protected]> Co-authored-by: zaneselvans <[email protected]>
* Add ETL_SUCCESS variable to gcp_pudl_deploy.sh to correctly handle notification logic * Update conda-lock.yml and rendered conda environment files. * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: bendnorman <[email protected]>
* Update conda-lock to bug-fixed version * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: zaneselvans <[email protected]>
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## main #3070 +/- ##
=====================================
Coverage 88.7% 88.7%
=====================================
Files 90 90
Lines 10994 10995 +1
=====================================
+ Hits 9758 9759 +1
Misses 1236 1236 ☔ View full report in Codecov by Sentry. |
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.