Merge branch 'main' into update-bulk-elec-data

catalyst-cooperative · Feb 10, 2025 · ba8c769 · ba8c769
2 parents 6797e95 + 97065a9
commit ba8c769
Show file tree

Hide file tree

Showing 7 changed files with 364 additions and 360 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -29,14 +29,14 @@ repos:
   # Formatters: hooks that re-write Python & documentation files
   ####################################################################################
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.9.4
+    rev: v0.9.6
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
       - id: ruff-format
 
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: v3.4.2
+    rev: v3.5.0
     hooks:
       - id: prettier
         types_or: [yaml]

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.5-ubuntu24.04
+FROM mambaorg/micromamba:2.0.6-ubuntu24.04
 
 ENV CONTAINER_HOME=/home/$MAMBA_USER
 ENV PGDATA=${CONTAINER_HOME}/pgdata

diff --git a/docs/conf.py b/docs/conf.py
@@ -94,7 +94,7 @@
 # we need to define these package to URL mappings:
 intersphinx_mapping = {
     "arrow": ("https://arrow.apache.org/docs/", None),
-    # "dagster": ("https://docs.dagster.io/", None),  # See: https://github.com/dagster-io/dagster/issues/27328
+    "dagster": ("https://docs.dagster.io/", None),
     "dask": ("https://docs.dask.org/en/latest/", None),
     "datasette": ("https://docs.datasette.io/en/stable/", None),
     "geopandas": ("https://geopandas.org/en/stable/", None),

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