Code

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

Code

Merged

zaneselvans merged 29 commits intomaincatalyst-cooperative/pudl:mainfrom nightly-build-2023-11-21catalyst-cooperative/pudl:nightly-build-2023-11-21Copy head branch name to clipboardNov 21, 2023

+15,617-15,572

Commits

Commits on Nov 15, 2023

• spot fix for 2021 cliffside capacity

  cmgosnell

  committed
  d0b0aa2

  Copy full SHA for d0b0aa2

• Merge branch 'dev' into spot-fix-cliffside-capacity

  cmgosnell

  committed
  48c3c77

  Copy full SHA for 48c3c77

• Update conda-lock.yml and rendered conda environment files.

  

  cmgosnell

  authored and

  github-actions[bot]

  committed
  f8993a9

  Copy full SHA for f8993a9

Commits on Nov 16, 2023

• Merge branch 'dev' into spot-fix-cliffside-capacity

  cmgosnell

  authored
  2360c0e

  Copy full SHA for 2360c0e

• Merge branch 'dev' into spot-fix-cliffside-capacity

  zaneselvans

  committed
  f5677a1

  Copy full SHA for f5677a1

• Merge pull request #3046 from catalyst-cooperative/spot-fix-cliffside-capacity

  Show description for 1000187
  zaneselvans

  authored
  1000187

  Copy full SHA for 1000187

• When merging automaticlly use conda lockfiles from current branch.

  zaneselvans

  committed
  90ba655

  Copy full SHA for 90ba655

• Update lockfiles just to make trouble.

  zaneselvans

  committed
  c91c09f

  Copy full SHA for c91c09f

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  e13039a

  Copy full SHA for e13039a

• Merge pull request #3056 from catalyst-cooperative/conda-lockfile-merge

  Show description for 0bf2549
  zaneselvans

  authored
  0bf2549

  Copy full SHA for 0bf2549

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  971ac30

  Copy full SHA for 971ac30

• Merge branch 'main' into dev

  zaneselvans

  committed
  ad01bfa

  Copy full SHA for ad01bfa

Commits on Nov 17, 2023

• Update conda-lock.yml and rendered conda environment files.

  zaneselvans

  authored
  fdd444d

  Copy full SHA for fdd444d

• Merge pull request #3057 from catalyst-cooperative/update-conda-lockfile

  Show description for ca51c39
  zaneselvans

  authored
  ca51c39

  Copy full SHA for ca51c39

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  c10edd0

  Copy full SHA for c10edd0

• Merge branch 'main' into dev

  zaneselvans

  committed
  49cce96

  Copy full SHA for 49cce96

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  dca1aaf

  Copy full SHA for dca1aaf

Commits on Nov 18, 2023

• Update PUDL to SQLAlchemy 2.0 (#2267)

  Show description for 6337426
  zaneselvans

  authored
  6337426

  Copy full SHA for 6337426

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  2493454

  Copy full SHA for 2493454

Commits on Nov 20, 2023

• Update conda-lock.yml and rendered conda environment files. (#3059)

  Show description for 0b62a62
  

  pudlbot

  and

  zaneselvans

  authored
  0b62a62

  Copy full SHA for 0b62a62

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  e50a9b8

  Copy full SHA for e50a9b8

• Pin conda-lock<2.5.0 (#3063)

  Show description for 853b3b0
  zaneselvans

  authored
  853b3b0

  Copy full SHA for 853b3b0

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  b2202a9

  Copy full SHA for b2202a9

• Change lock file merge strategy to look for .yml instead of .yaml files (#3065)

  bendnorman

  authored
  f4fdb00

  Copy full SHA for f4fdb00

• [pre-commit.ci] pre-commit autoupdate (#3062)

  Show description for bb030a5
  

  pre-commit-ci[bot]

  and

  zaneselvans

  authored
  bb030a5

  Copy full SHA for bb030a5

• Fix full build notification logic (#3058)

  Show description for 9fb0151
  bendnorman

  authored
  9fb0151

  Copy full SHA for 9fb0151

Commits on Nov 21, 2023

• Unpin conda lock (#3069)

  Show description for 67eb550
  zaneselvans

  authored
  67eb550

  Copy full SHA for 67eb550

• Update conda-lock.yml and rendered conda environment files.

  

  zaneselvans

  authored and

  github-actions[bot]

  committed
  d9209f3

  Copy full SHA for d9209f3

• Merge branch 'main' into nightly-build-2023-11-21

  zaneselvans

  committed
  4bd0a64

  Copy full SHA for 4bd0a64