Hide diffs in lock files by default. (#3103)

* Hide diffs in lock files by default. * Add mypy as a test for lockfile diff visibility. pudl-bot, do your thing! * Update conda-lock.yml and rendered conda environment files. * Revert "Add mypy as a test for lockfile diff visibility. pudl-bot, do your thing!" This reverts commit e7a8e82. * Update conda-lock.yml and rendered conda environment files. --------- Co-authored-by: jdangerx <[email protected]>
catalyst-cooperative · Dec 4, 2023 · 8393bca · 8393bca
1 parent 66052a5
commit 8393bca
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,7 +1,7 @@
 *.ipynb linguist-detectable=false
 *.html linguist-detectable=false
 eia861-transform.ipynb merge=ours
-environments/conda-*lock.yml merge=ours
+environments/conda-*lock.yml merge=ours linguist-generated=true
 *.csv text
 *.py text
 *.json text

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