Skip to content

Commit

Permalink
Merge branch 'dev' into spot-fix-cliffside-capacity
Browse files Browse the repository at this point in the history
  • Loading branch information
zaneselvans committed Nov 16, 2023
2 parents 2360c0e + e9145c7 commit f5677a1
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 91 deletions.
1 change: 0 additions & 1 deletion .github/workflows/zenodo-cache-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
environment-file: environments/conda-lock.yml
environment-name: pudl-dev
cache-environment: true
create-args: --category main dev docs test datasette

- name: Log environment details
run: |
Expand Down
12 changes: 6 additions & 6 deletions environments/conda-linux-64.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ dependencies:
- libxcb=1.15=h0b41bf4_0
- libxml2=2.11.5=h232c23b_1
- libzip=1.10.1=h2629f0a_3
- pcre2=10.40=hc3806b6_0
- pcre2=10.42=hcad00b1_0
- readline=8.2=h8228510_1
- s2n=1.3.56=h06160fa_0
- tk=8.6.13=noxft_h4845f30_101
Expand All @@ -118,7 +118,7 @@ dependencies:
- freetype=2.12.1=h267a509_2
- krb5=1.21.2=h659d440_0
- libarchive=3.7.2=h039dbb9_0
- libglib=2.78.1=hebfc3b9_0
- libglib=2.78.1=h783c2da_1
- libllvm15=15.0.7=h5cf9203_3
- libopenblas=0.3.24=pthreads_h413a1c8_0
- libthrift=0.19.0=hb90f79a_1
Expand Down Expand Up @@ -333,7 +333,7 @@ dependencies:
- coloredlogs=14.0=pyhd8ed1ab_3
- comm=0.1.4=pyhd8ed1ab_0
- coverage=7.3.2=py311h459d7ec_0
- fonttools=4.44.1=py311h459d7ec_0
- fonttools=4.44.3=py311h459d7ec_0
- gitdb=4.0.11=pyhd8ed1ab_0
- graphql-core=3.2.3=pyhd8ed1ab_0
- grpcio=1.59.2=py311ha6695c7_0
Expand Down Expand Up @@ -401,7 +401,7 @@ dependencies:
- arrow=1.3.0=pyhd8ed1ab_0
- async-timeout=4.0.3=pyhd8ed1ab_0
- aws-c-s3=0.3.24=h7630044_0
- botocore=1.32.0=pyhd8ed1ab_0
- botocore=1.32.1=pyhd8ed1ab_0
- branca=0.7.0=pyhd8ed1ab_1
- croniter=2.0.1=pyhd8ed1ab_0
- cryptography=41.0.5=py311h63ff55d_0
Expand Down Expand Up @@ -467,7 +467,7 @@ dependencies:
- isoduration=20.11.0=pyhd8ed1ab_0
- jsonschema=4.19.2=pyhd8ed1ab_0
- jupyter_core=5.5.0=py311h38be061_0
- libgdal=3.8.0=h0a992f2_1
- libgdal=3.8.0=h12dd931_3
- numba=0.58.1=py311h96b013e_0
- numexpr=2.8.7=py311h039bad6_104
- oauthlib=3.2.2=pyhd8ed1ab_0
Expand Down Expand Up @@ -496,7 +496,7 @@ dependencies:
- doc8=1.1.1=pyhd8ed1ab_0
- email-validator=2.1.0.post1=pyhd8ed1ab_0
- frictionless=4.40.8=pyh6c4a22f_0
- gdal=3.8.0=py311h815a124_1
- gdal=3.8.0=py311h815a124_3
- geopandas-base=0.14.1=pyha770c72_0
- google-auth=2.23.4=pyhca7485f_0
- gql-with-requests=3.4.1=pyhd8ed1ab_0
Expand Down
Loading

0 comments on commit f5677a1

Please sign in to comment.