Skip to content

Commit

Permalink
Merge branch 'dev' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
zaneselvans committed Nov 20, 2023
2 parents 6dbf7d1 + f4fdb00 commit 3429355
Show file tree
Hide file tree
Showing 7 changed files with 15,393 additions and 15,426 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.ipynb linguist-detectable=false
*.html linguist-detectable=false
eia861-transform.ipynb merge=ours
environments/conda-*lock.yaml merge=ours
environments/conda-*lock.yml merge=ours
*.csv text
*.py text
*.json text
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-conda-lockfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
environment-name: conda-lock
create-args: >-
python=3.11
conda-lock
conda-lock<2.5.0
prettier
- name: Run conda-lock to recreate lockfile from scratch
run: |
Expand Down
6 changes: 3 additions & 3 deletions environments/conda-linux-64.lock.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by conda-lock.
# platform: linux-64
# input_hash: 3488f1f8b42f706745fb582d78e40be692fed5eb08accbfb1ebf539a089d87bd
# input_hash: 746ac2512e69c3fbcdbcabb3c0a9cef617d920eb423d83e50efec46fe41e75ea

channels:
- conda-forge
Expand Down Expand Up @@ -505,7 +505,7 @@ dependencies:
- jupyter_client=8.6.0=pyhd8ed1ab_0
- keyring=24.3.0=py311h38be061_0
- librsvg=2.56.3=h98fae49_0
- matplotlib-base=3.8.1=py311h54ef318_0
- matplotlib-base=3.8.2=py311h54ef318_0
- nbformat=5.9.2=pyhd8ed1ab_0
- pandera-core=0.17.2=pyhd8ed1ab_1
- pre-commit=3.5.0=pyha770c72_0
Expand All @@ -514,7 +514,7 @@ dependencies:
- scikit-learn=1.3.2=py311hc009520_1
- timezonefinder=6.2.0=py311h459d7ec_2
- catalystcoop.ferc_xbrl_extractor=1.2.1=pyhd8ed1ab_0
- conda-lock=2.5.0=pyhd8ed1ab_0
- conda-lock=2.4.2=pyhd8ed1ab_0
- dagster-graphql=1.5.9=pyhd8ed1ab_0
- dagster-postgres=0.21.9=pyhd8ed1ab_0
- fiona=1.9.5=py311hf8e0aa6_1
Expand Down
Loading

0 comments on commit 3429355

Please sign in to comment.