Use prettier to standardize formatting of lockfiles.

.github/workflows/update-lockfile.yml

@@ -30,6 +30,7 @@ jobs:
           create-args: >-
             python=3.11
             conda-lock
+            prettier
 
       - name: Run conda-lock to recreate lockfile from scratch
         run: |

Makefile

@@ -31,6 +31,7 @@ conda-lock:
 		--extras docs \
 		--extras datasette \
 		conda-lock.yml)
+	prettier --write environments/*.yml
 
 ########################################################################################
 # Build documentation (for local use)

environments/conda-linux-64.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 76d990a5280c67a86298a825022c4767c0b2833a5d8c84a1e7737006040a2986
+# input_hash: 3920ccb8327a1c20bac58a1ff175e0be67f5859e5c279ad587da945a38669708
 
 channels:
   - conda-forge
@@ -90,7 +90,7 @@ dependencies:
   - libgfortran-ng=13.2.0=h69a702a_2
   - libkml=1.3.0=h01aab08_1018
   - libllvm14=14.0.6=hcd5def8_4
-  - libnghttp2=1.52.0=h61bc06f_0
+  - libnghttp2=1.55.1=h47da74e_0
   - libpng=1.6.39=h753d276_0
   - libprotobuf=4.23.4=hf27288f_6
   - librttopo=1.1.0=hb58d41b_14
@@ -229,6 +229,7 @@ dependencies:
   - pkginfo=1.9.6=pyhd8ed1ab_0
   - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1
   - pluggy=1.3.0=pyhd8ed1ab_0
+  - prettier=3.0.3=h31abb78_0
   - prometheus_client=0.17.1=pyhd8ed1ab_0
   - psutil=5.9.5=py311h459d7ec_1
   - ptyprocess=0.7.0=pyhd3deb0d_0

environments/conda-lock.yml

@@ -17,9 +17,9 @@
 version: 1
 metadata:
   content_hash:
-    linux-64: 76d990a5280c67a86298a825022c4767c0b2833a5d8c84a1e7737006040a2986
-    osx-64: 4e9d00fee40af1655268fc3b42f474269076e94a85eeee8d482ce5ed5da1b78c
-    osx-arm64: 55f8c5da9e411730c83dea8cbf188533f8250192814eeaf3a6863203ad734c5f
+    linux-64: 3920ccb8327a1c20bac58a1ff175e0be67f5859e5c279ad587da945a38669708
+    osx-64: 10a59fe0ea51a68e94e4a3c8f615ab299bb624359fd0f537e80ba8cb0f18ba78
+    osx-arm64: d6109c86490cd4327b44c213f4718ca81968fb965fe614937c37446a096cc42e
   channels:
     - url: conda-forge
       used_env_vars: []
@@ -1073,20 +1073,20 @@ package:
     category: main
     optional: false
   - name: libnghttp2
-    version: 1.52.0
+    version: 1.55.1
     manager: conda
     platform: linux-64
     dependencies:
-      c-ares: ">=1.18.1,<2.0a0"
+      c-ares: ">=1.20.1,<2.0a0"
       libev: ">=4.33,<4.34.0a0"
       libgcc-ng: ">=12"
       libstdcxx-ng: ">=12"
       libzlib: ">=1.2.13,<1.3.0a0"
-      openssl: ">=3.0.8,<4.0a0"
-    url: https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.52.0-h61bc06f_0.conda
+      openssl: ">=3.1.4,<4.0a0"
+    url: https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.55.1-h47da74e_0.conda
     hash:
-      md5: 613955a50485812985c059e7b269f42e
-      sha256: ecd6b08c2b5abe7d1586428c4dd257dcfa00ee53700d79cdc8bca098fdfbd79a
+      md5: a802251d1eaeeae041c867faf0f94fa8
+      sha256: 5e60b852dbde156ef1fa939af2491fe0e9eb3000de146786dede7cda8991ae4c
     category: main
     optional: false
   - name: libpng
@@ -2966,6 +2966,19 @@ package:
       sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5
     category: dev
     optional: true
+  - name: prettier
+    version: 3.0.3
+    manager: conda
+    platform: linux-64
+    dependencies:
+      __glibc: ">=2.17,<3.0.a0"
+      nodejs: ">=20.5.1,<21.0a0"
+    url: https://conda.anaconda.org/conda-forge/linux-64/prettier-3.0.3-h31abb78_0.conda
+    hash:
+      md5: bbfd821c7b1264ddfdec4a03e3c0be4f
+      sha256: 74b482320e860a4b0f039abf1194a03a671dcc0db89d4bf4c0838ba66bb1bb9f
+    category: dev
+    optional: true
   - name: prometheus_client
     version: 0.17.1
     manager: conda
@@ -8971,19 +8984,20 @@ package:
     category: main
     optional: false
   - name: libnghttp2
-    version: 1.52.0
+    version: 1.55.1
     manager: conda
     platform: osx-64
     dependencies:
-      c-ares: ">=1.18.1,<2.0a0"
-      libcxx: ">=14.0.6"
+      __osx: ">=10.9"
+      c-ares: ">=1.20.1,<2.0a0"
+      libcxx: ">=15.0.7"
       libev: ">=4.33,<4.34.0a0"
       libzlib: ">=1.2.13,<1.3.0a0"
-      openssl: ">=3.0.8,<4.0a0"
-    url: https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.52.0-he2ab024_0.conda
+      openssl: ">=3.1.4,<4.0a0"
+    url: https://conda.anaconda.org/conda-forge/osx-64/libnghttp2-1.55.1-hc0a10c5_0.conda
     hash:
-      md5: 12ac7d100bf260263e30a019517f42a2
-      sha256: 093e4f3f62b3b07befa403e84a1f550cffe3b3961e435d42a75284f44be5f68a
+      md5: a9269f10f70851af622c112d2956d544
+      sha256: a0352eafcf148aa1dfa25f28cf30c80f70bc78c1e549fdec6b7aad100b865944
     category: main
     optional: false
   - name: libprotobuf
@@ -10461,6 +10475,18 @@ package:
       sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5
     category: dev
     optional: true
+  - name: prettier
+    version: 3.0.3
+    manager: conda
+    platform: osx-64
+    dependencies:
+      nodejs: ">=20.5.1,<21.0a0"
+    url: https://conda.anaconda.org/conda-forge/osx-64/prettier-3.0.3-hbd11d21_0.conda
+    hash:
+      md5: e6eade788ed0a73faba3e5d2125aee41
+      sha256: ec5e9d4f30b7b0255666ae9917e736f68b488dc6c374e871f550592e59fdef75
+    category: dev
+    optional: true
   - name: prometheus_client
     version: 0.17.1
     manager: conda
@@ -16420,19 +16446,20 @@ package:
     category: main
     optional: false
   - name: libnghttp2
-    version: 1.52.0
+    version: 1.55.1
     manager: conda
     platform: osx-arm64
     dependencies:
-      c-ares: ">=1.18.1,<2.0a0"
-      libcxx: ">=14.0.6"
+      __osx: ">=10.9"
+      c-ares: ">=1.20.1,<2.0a0"
+      libcxx: ">=15.0.7"
       libev: ">=4.33,<4.34.0a0"
       libzlib: ">=1.2.13,<1.3.0a0"
-      openssl: ">=3.0.8,<4.0a0"
-    url: https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.52.0-hae82a92_0.conda
+      openssl: ">=3.1.4,<4.0a0"
+    url: https://conda.anaconda.org/conda-forge/osx-arm64/libnghttp2-1.55.1-h2b02ca0_0.conda
     hash:
-      md5: 1d319e95a0216f801293626a00337712
-      sha256: 1a3944d6295dcbecdf6489ce8a05fe416ad401727c901ec390e9200a351bdb10
+      md5: eabfa8f7d2b7751ee28dc6762bbbf168
+      sha256: d30f26b57225609e1cd285921113bc634f008e83b1f2296245f468ca682e39a6
     category: main
     optional: false
   - name: libprotobuf
@@ -17909,6 +17936,18 @@ package:
       sha256: 7bf2ad9d747e71f1e93d0863c2c8061dd0f2fe1e582f28d292abfb40264a2eb5
     category: dev
     optional: true
+  - name: prettier
+    version: 3.0.3
+    manager: conda
+    platform: osx-arm64
+    dependencies:
+      nodejs: ">=20.5.1,<21.0a0"
+    url: https://conda.anaconda.org/conda-forge/osx-arm64/prettier-3.0.3-hb67532b_0.conda
+    hash:
+      md5: d5cbb22f37240fee10aadcb721b1bd7a
+      sha256: 7c9de5b1afb9cb63d93376c61cd1f1860f21350294acd5799c4cc7696b7c091a
+    category: dev
+    optional: true
   - name: prometheus_client
     version: 0.17.1
     manager: conda

environments/conda-osx-64.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: osx-64
-# input_hash: 4e9d00fee40af1655268fc3b42f474269076e94a85eeee8d482ce5ed5da1b78c
+# input_hash: 10a59fe0ea51a68e94e4a3c8f615ab299bb624359fd0f537e80ba8cb0f18ba78
 
 channels:
   - conda-forge
@@ -93,7 +93,7 @@ dependencies:
   - libgfortran=5.0.0=13_2_0_h97931a8_1
   - libglib=2.78.0=hc62aa5d_0
   - libkml=1.3.0=hab3ca0e_1018
-  - libnghttp2=1.52.0=he2ab024_0
+  - libnghttp2=1.55.1=hc0a10c5_0
   - libprotobuf=4.23.4=he0c2237_6
   - librttopo=1.1.0=h23f359d_14
   - libssh2=1.11.0=hd019ec5_0
@@ -207,6 +207,7 @@ dependencies:
   - pkginfo=1.9.6=pyhd8ed1ab_0
   - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1
   - pluggy=1.3.0=pyhd8ed1ab_0
+  - prettier=3.0.3=hbd11d21_0
   - prometheus_client=0.17.1=pyhd8ed1ab_0
   - psutil=5.9.5=py311h2725bcf_1
   - ptyprocess=0.7.0=pyhd3deb0d_0

environments/conda-osx-arm64.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: osx-arm64
-# input_hash: 55f8c5da9e411730c83dea8cbf188533f8250192814eeaf3a6863203ad734c5f
+# input_hash: d6109c86490cd4327b44c213f4718ca81968fb965fe614937c37446a096cc42e
 
 channels:
   - conda-forge
@@ -93,7 +93,7 @@ dependencies:
   - libgfortran=5.0.0=13_2_0_hd922786_1
   - libglib=2.78.0=h24e9cb9_0
   - libkml=1.3.0=h1eb4d9f_1018
-  - libnghttp2=1.52.0=hae82a92_0
+  - libnghttp2=1.55.1=h2b02ca0_0
   - libprotobuf=4.23.4=hf590ac1_6
   - librttopo=1.1.0=h667cd51_14
   - libssh2=1.11.0=h7a5bd25_0
@@ -207,6 +207,7 @@ dependencies:
   - pkginfo=1.9.6=pyhd8ed1ab_0
   - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_1
   - pluggy=1.3.0=pyhd8ed1ab_0
+  - prettier=3.0.3=hb67532b_0
   - prometheus_client=0.17.1=pyhd8ed1ab_0
   - psutil=5.9.5=py311heffc1b2_1
   - ptyprocess=0.7.0=pyhd3deb0d_0

pyproject.toml

@@ -18,8 +18,8 @@ dependencies = [
     "catalystcoop.dbfread>=3.0,<3.1",
     "catalystcoop.ferc-xbrl-extractor>=1.2.0,<2",
     "coloredlogs>=14.0,<15.1",  # Dagster requires 14.0
-    "dagster-webserver>=1.5,<1.6",
-    "dagster>=1.5,<1.6",
+    "dagster-webserver>=1.5.5,<1.6",
+    "dagster>=1.5.5,<1.6",
     "dask>=2023,<2023.10.1",
     "datapackage>=1.15,<1.16",  # Transition datastore to use frictionless.
     "email-validator>=1.0.3",  # pydantic[email]
@@ -49,7 +49,7 @@ dependencies = [
     "scipy>=1.11,<1.12",
     "Shapely>=2,<3",
     "sqlalchemy>=1.4,<2",
-    "timezonefinder>=6,<6.3",
+    "timezonefinder>=6.2,<6.3",
     "xlrd>=2.0.1",  # pandas[excel]
     "xlsxwriter>=3.1,<3.2",  # pandas[excel]
 ]
@@ -127,6 +127,7 @@ dev = [
     "jupyter-resource-usage",
     "lxml>=4.6,<4.10",
     "nbconvert>=7,<8",
+    "prettier>=3.0",
     "ruff>=0.1,<0.2",
     "twine>=4,<4.1",
 ]