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-11-21 #3070

Merged
merged 29 commits into from
Nov 21, 2023
Merged

Merge dev into main for 2023-11-21 #3070

merged 29 commits into from
Nov 21, 2023

Conversation

zaneselvans
Copy link
Member

cmgosnell and others added 29 commits November 15, 2023 12:17
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]>
* 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]>
Copy link

codecov bot commented Nov 21, 2023

Codecov Report

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

Comparison is base (1e7d29e) 88.7% compared to head (4bd0a64) 88.7%.
Report is 5 commits behind head on main.

Files Patch % Lines
src/pudl/io_managers.py 81.8% 2 Missing ⚠️
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.
📢 Have feedback on the report? Share it here.

@zaneselvans zaneselvans merged commit a16f77b into main Nov 21, 2023
@zaneselvans zaneselvans deleted the nightly-build-2023-11-21 branch November 21, 2023 21:48
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.

4 participants