bump to condalock 1.1 and mamba 0.25

.github/workflows/CondaLock.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   condalock:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     defaults:
       run:
         shell: bash -l {0}
@@ -51,34 +52,44 @@ jobs:
 
       # Could run as single step in parallel, but would complicate logs...
       - name: Run conda-lock base-notebook
+        timeout-minutes: 5
+        continue-on-error: true
         run: |
           conda clean --all --yes --force-pkgs-dirs
           cd base-notebook
           conda-lock lock --mamba -k explicit -f environment.yml -p linux-64
           ../generate-packages-list.py conda-linux-64.lock > packages.txt
 
       - name: Run conda-lock pangeo-notebook
+        timeout-minutes: 5
+        continue-on-error: true
         run: |
           conda clean --all --yes --force-pkgs-dirs
           cd pangeo-notebook
           conda-lock lock --mamba -k explicit -f environment.yml -f ../base-notebook/environment.yml -p linux-64
           ../generate-packages-list.py conda-linux-64.lock > packages.txt
 
       - name: Run conda-lock ml-notebook
+        timeout-minutes: 5
+        continue-on-error: true
         run: |
           conda clean --all --yes --force-pkgs-dirs
           cd ml-notebook
           conda-lock lock --mamba -k explicit -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml  -p linux-64
           ../generate-packages-list.py conda-linux-64.lock > packages.txt
 
       - name: Run conda-lock pytorch-notebook
+        timeout-minutes: 5
+        continue-on-error: true
         run: |
           conda clean --all --yes --force-pkgs-dirs
           cd pytorch-notebook
           conda-lock lock --mamba -k explicit -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64
           ../generate-packages-list.py conda-linux-64.lock > packages.txt
 
       - name: Run conda-lock forge
+        timeout-minutes: 5
+        continue-on-error: true
         run: |
           conda clean --all --yes --force-pkgs-dirs
           cd forge

base-notebook/conda-linux-64.lock

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 9c3474c8725c05837b4940dbdd562ac837c41603711e3313121715c1c353f223
+# input_hash: 678269b75f5dfb5a715d3c55a98c1d3412b0676dea5142b83d27fb09f740417a
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/ca-certificates-2022.6.15-ha878542_0.tar.bz2#c320890f77fd1d617fa876e0982002c2
@@ -23,10 +23,10 @@ https://conda.anaconda.org/conda-forge/linux-64/libdeflate-1.12-h166bdaf_0.tar.b
 https://conda.anaconda.org/conda-forge/linux-64/libev-4.33-h516909a_1.tar.bz2#6f8720dff19e17ce5d48cfe7f3d2f0a3
 https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2#d645c6d2ac96843a2bfaccd2d62b3ac3
 https://conda.anaconda.org/conda-forge/linux-64/libnsl-2.0.0-h7f98852_0.tar.bz2#39b1328babf85c7c3a61636d9cd50206
-https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.20-pthreads_h78a6416_0.tar.bz2#9b6d0781953c9e353faee494336cc229
+https://conda.anaconda.org/conda-forge/linux-64/libopenblas-0.3.20-pthreads_h78a6416_1.tar.bz2#759c6f385ca4110f5fb185d404d306a3
 https://conda.anaconda.org/conda-forge/linux-64/libsodium-1.0.18-h36c2ea0_1.tar.bz2#c3788462a6fbddafdb413a9f9053e58d
 https://conda.anaconda.org/conda-forge/linux-64/libuuid-2.32.1-h7f98852_1000.tar.bz2#772d69f030955d9646d3d0eaf21d859d
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.3-h166bdaf_1.tar.bz2#9c2a9c67255426d22174f888ba10b4c6
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-base-1.2.3-h166bdaf_2.tar.bz2#99c0160c84e61348aa8eb2949b24e6d3
 https://conda.anaconda.org/conda-forge/linux-64/libzlib-1.2.12-h166bdaf_2.tar.bz2#8302381297332ea50532cf2c67961080
 https://conda.anaconda.org/conda-forge/linux-64/lz4-c-1.9.3-h9c3ff4c_1.tar.bz2#fbe97e8fa6f275d7c76a09e795adc3e6
 https://conda.anaconda.org/conda-forge/linux-64/ncurses-6.3-h27087fc_1.tar.bz2#4acfc691e64342b9dae57cf2adc63238
@@ -51,11 +51,11 @@ https://conda.anaconda.org/conda-forge/linux-64/libnghttp2-1.47.0-h727a467_0.tar
 https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.37-h753d276_3.tar.bz2#3e868978a04de8bf65a97bb86760f47a
 https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.10.0-ha56f1ee_2.tar.bz2#6ab4eaa11ff01801cffca0a27489dc04
 https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.4.0-hc85c160_1.tar.bz2#151f9fae3ab50f039c8735e47770aa2d
-https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.39.1-h4ff8645_0.tar.bz2#6acda9d2a3ea84b58637b8f880bbf29b
+https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.39.2-h4ff8645_0.tar.bz2#2cf5cb4cd116a78e639977eb61ad9987
 https://conda.anaconda.org/conda-forge/linux-64/freetype-2.10.4-h0708190_1.tar.bz2#4a06f2ac2e5bfae7b6b245171c3f07aa
 https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.12-hddcbb42_0.tar.bz2#797117394a4aa588de6d741b06fad80f
 https://conda.anaconda.org/conda-forge/linux-64/libcurl-7.83.1-h7bff187_0.tar.bz2#d0c278476dba3b29ee13203784672ab1
-https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.3-h522a892_0.tar.bz2#96e218d06394a4e4d77028cf70162a09
+https://conda.anaconda.org/conda-forge/linux-64/libwebp-1.2.3-h522a892_1.tar.bz2#424fabaabbfb6ec60492d3aba900f513
 https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.4.0-hb52868f_1.tar.bz2#b7ad78ad2e9ee155f59e6428406ee824
 https://conda.anaconda.org/conda-forge/linux-64/python-3.9.13-h9a8a25e_0_cpython.tar.bz2#69bc307cc4d7396c5fccb26bbcc9c379
 https://conda.anaconda.org/conda-forge/noarch/async_generator-1.10-py_0.tar.bz2#d56c596e61b1c4952acf0a9920856c12
@@ -68,7 +68,7 @@ https://conda.anaconda.org/conda-forge/noarch/cloudpickle-2.1.0-pyhd8ed1ab_0.tar
 https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_0.tar.bz2#43afe5ab04e35e17ba28649471dd7364
 https://conda.anaconda.org/conda-forge/noarch/defusedxml-0.7.1-pyhd8ed1ab_0.tar.bz2#961b3a227b437d82ad7054484cfa71b2
 https://conda.anaconda.org/conda-forge/noarch/entrypoints-0.4-pyhd8ed1ab_0.tar.bz2#3cf04868fee0a029769bd41f4b2fbf2d
-https://conda.anaconda.org/conda-forge/noarch/executing-0.8.3-pyhd8ed1ab_0.tar.bz2#8d70f4543c1f701b946f85e9f9a00800
+https://conda.anaconda.org/conda-forge/noarch/executing-0.9.1-pyhd8ed1ab_0.tar.bz2#aef67104bc729d727697a015545f7ec3
 https://conda.anaconda.org/conda-forge/noarch/flit-core-3.7.1-pyhd8ed1ab_0.tar.bz2#f93822cba5c20161560661988a88f2c0
 https://conda.anaconda.org/conda-forge/noarch/fsspec-2022.5.0-pyhd8ed1ab_0.tar.bz2#db4ffc615663c66a9cc0869ce4d1092b
 https://conda.anaconda.org/conda-forge/noarch/heapdict-1.0.1-py_0.tar.bz2#77242bfb1e74a627fb06319b5a2d3b95
@@ -116,7 +116,7 @@ https://conda.anaconda.org/conda-forge/linux-64/debugpy-1.6.0-py39h5a03fae_0.tar
 https://conda.anaconda.org/conda-forge/linux-64/frozenlist-1.3.0-py39hb9d737c_1.tar.bz2#bda6570318c036a48f8d8b694ca59dbd
 https://conda.anaconda.org/conda-forge/linux-64/greenlet-1.1.2-py39h5a03fae_2.tar.bz2#d7d11bc86d42472816cfb0f9f27da0ad
 https://conda.anaconda.org/conda-forge/linux-64/importlib-metadata-4.11.4-py39hf3d152e_0.tar.bz2#4c2a0eabf0b8980b2c755646a6f750eb
-https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.8.0-pyhd8ed1ab_0.tar.bz2#fd5c189cea9267b81d97d1b2306dd202
+https://conda.anaconda.org/conda-forge/noarch/importlib_resources-5.9.0-pyhd8ed1ab_0.tar.bz2#393a52ae5450ac981a0b67c8175d61fa
 https://conda.anaconda.org/conda-forge/linux-64/jedi-0.18.1-py39hf3d152e_1.tar.bz2#941922f60b68bc6768c9360afb94d138
 https://conda.anaconda.org/conda-forge/linux-64/jupyter_core-4.11.1-py39hf3d152e_0.tar.bz2#fc5a19614b813f4e20f2676ecba3347e
 https://conda.anaconda.org/conda-forge/linux-64/lz4-4.0.0-py39h029007f_2.tar.bz2#f7471ec2e3d4a017e789bd92eaeb807c
@@ -179,7 +179,7 @@ https://conda.anaconda.org/conda-forge/noarch/wcwidth-0.2.5-pyh9f0ad1d_2.tar.bz2
 https://conda.anaconda.org/conda-forge/noarch/certipy-0.1.3-py_0.tar.bz2#23486713ef5712923e7c57cae609b22e
 https://conda.anaconda.org/conda-forge/noarch/nbclient-0.6.6-pyhd8ed1ab_0.tar.bz2#e6a164688c75dd93a999fc412bc6bd21
 https://conda.anaconda.org/conda-forge/noarch/prompt-toolkit-3.0.30-pyha770c72_0.tar.bz2#f5f08dc71d7e24572b131d5fb0ad1ebc
-https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.10-pyhd8ed1ab_0.tar.bz2#14f22c5b9cfd0d93c2806faaa3fe6dec
+https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.11-pyhd8ed1ab_0.tar.bz2#0738978569b10669bdef41c671252dd1
 https://conda.anaconda.org/conda-forge/noarch/distributed-2022.7.0-pyhd8ed1ab_0.tar.bz2#6ebea83c129bb80f8ce7d3c5dd4d1bd6
 https://conda.anaconda.org/conda-forge/linux-64/ipython-8.4.0-py39hf3d152e_0.tar.bz2#87b4479751ab8d977493bfc808951292
 https://conda.anaconda.org/conda-forge/noarch/nbconvert-core-6.5.0-pyhd8ed1ab_0.tar.bz2#42f74c4b38a099025167e76a7437edf1

base-notebook/packages.txt

@@ -41,7 +41,7 @@ decorator==5.1.1
 defusedxml==0.7.1
 distributed==2022.7.0
 entrypoints==0.4
-executing==0.8.3
+executing==0.9.1
 flit-core==3.7.1
 freetype==2.10.4
 frozenlist==1.3.0
@@ -52,7 +52,7 @@ heapdict==1.0.1
 idna==3.3
 importlib-metadata==4.11.4
 importlib_metadata==4.11.4
-importlib_resources==5.8.0
+importlib_resources==5.9.0
 ipykernel==6.15.1
 ipython==8.4.0
 ipython_genutils==0.2.0
@@ -174,7 +174,7 @@ sniffio==1.2.0
 sortedcontainers==2.4.0
 soupsieve==2.3.2.post1
 sqlalchemy==1.4.39
-sqlite==3.39.1
+sqlite==3.39.2
 stack_data==0.3.0
 tblib==1.7.0
 terminado==0.15.0
@@ -186,7 +186,7 @@ traitlets==5.3.0
 typing-extensions==4.3.0
 typing_extensions==4.3.0
 tzdata==2022a
-urllib3==1.26.10
+urllib3==1.26.11
 wcwidth==0.2.5
 webencodings==0.5.1
 websocket-client==1.3.3

environment-condalock.yml

@@ -2,5 +2,5 @@ name: condalock
 channels:
   - conda-forge
 dependencies:
-  - conda-lock==1.0.5
-  - mamba==0.23
+  - conda-lock=1.1
+  - mamba=0.25