Merge branch 'dev' into entity_matching

catalyst-cooperative · Dec 12, 2023 · 98e86d9 · 98e86d9
2 parents f435204 + f020a07
commit 98e86d9
Show file tree

Hide file tree

Showing 30 changed files with 866 additions and 872 deletions.
diff --git a/.github/workflows/bot-auto-merge.yml b/.github/workflows/bot-auto-merge.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Impersonate auto merge PR bot
-        uses: tibdex/github-app-token@v1
+        uses: tibdex/github-app-token@v2
         id: generate-token
         with:
           app_id: ${{ secrets.BOT_AUTO_MERGE_PRS_APP_ID }}

diff --git a/.github/workflows/build-deploy-pudl.yml b/.github/workflows/build-deploy-pudl.yml
@@ -45,7 +45,7 @@ jobs:
 
       - name: Docker Metadata
         id: docker_metadata
-        uses: docker/metadata-action@v4.4.0
+        uses: docker/metadata-action@v5.3.0
         with:
           images: catalystcoop/pudl-etl
           flavor: |
@@ -83,7 +83,7 @@ jobs:
 
       # Setup gcloud CLI
       - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
 
       - name: Determine commit information
         run: |-

diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Docker Metadata
         id: docker_metadata
-        uses: docker/metadata-action@v4.4.0
+        uses: docker/metadata-action@v5.3.0
         with:
           images: catalystcoop/pudl-etl
           flavor: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ jobs:
         with:
           fetch-depth: 2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Build source and wheel distributions

diff --git a/.github/workflows/run-etl.yml b/.github/workflows/run-etl.yml
@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v4
       - name: Docker Metadata
         id: docker_metadata
-        uses: docker/metadata-action@v4.4.0
+        uses: docker/metadata-action@v5.3.0
         # TODO(rousik): we could consider YYYY-MM-DD-HHMM-branch-sha
         with:
           images: catalystcoop/pudl-etl-ci

diff --git a/.github/workflows/zenodo-cache-sync.yml b/.github/workflows/zenodo-cache-sync.yml
@@ -69,7 +69,7 @@ jobs:
           service_account: "zenodo-cache-manager@catalyst-cooperative-pudl.iam.gserviceaccount.com"
 
       - name: Set up Cloud SDK
-        uses: google-github-actions/setup-gcloud@v1
+        uses: google-github-actions/setup-gcloud@v2
 
       - name: Update GCS cache with any new Zenodo archives
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,7 +29,7 @@ repos:
   # Formatters: hooks that re-write Python & documentation files
   ####################################################################################
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.6
+    rev: v0.1.7
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/docs/release_notes.rst b/docs/release_notes.rst
@@ -18,6 +18,12 @@ v2023.12.XX
   outputs describing historical utility and balancing authority service territories. See
   :issue:`1174` and :pr:`3086`.
 
+Data Coverage
+^^^^^^^^^^^^^
+* Updated :doc:`data_sources/epacems` to switch to pulling the quarterly updates of
+  CEMS instead of the annual files. Integrates CEMS through 2023q3. See issue
+  :issue:`2973` & PR :pr:`3096`.
+
 ---------------------------------------------------------------------------------------
 v2023.12.01
 ---------------------------------------------------------------------------------------

diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml