diff --git a/environments/py-3.10-linux-64-dev.conda.lock.yml b/environments/py-3.10-linux-64-dev.conda.lock.yml index c52ef9ed..0678e9c8 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -40,7 +40,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310h3788b33_0 - - coverage=7.13.1=py310h3406613_0 + - coverage=7.13.2=py310h3406613_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py310h7c4b9e2_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -98,7 +98,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py310haaf941d_2 - krb5=1.21.3=h659f571_0 @@ -118,7 +118,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -173,12 +173,12 @@ dependencies: - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=22.6.0=hc19f0b3_1 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=2.3.3=py310h0158d43_2 @@ -209,7 +209,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.10.19=h3c07f61_2_cpython + - python=3.10.19=h3c07f61_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -231,7 +231,7 @@ dependencies: - scikit-learn=1.6.1=py310h27f47ee_0 - scipy=1.14.1=py310hfcf56fc_2 - send2trash=2.1.0=pyha191276_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -250,7 +250,7 @@ dependencies: - terminado=0.18.1=pyhc90fa1f_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -266,7 +266,7 @@ dependencies: - unicodedata2=17.0.0=py310h7c4b9e2_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.6.3=pyhd8ed1ab_0 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -284,9 +284,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 4180ccb7..f552a65c 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -61,7 +61,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -104,7 +104,7 @@ dependencies: - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - packaging=26.0=pyhcf101f3_0 - pandas=2.3.3=py310h0158d43_2 - partd=1.4.2=pyhd8ed1ab_0 @@ -118,7 +118,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.10.19=h3c07f61_2_cpython + - python=3.10.19=h3c07f61_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -129,13 +129,13 @@ dependencies: - rtree=1.2.0=py310haf1e407_1 - scikit-learn=1.6.1=py310h27f47ee_0 - scipy=1.14.1=py310hfcf56fc_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb700be7_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.3=py310h7c4b9e2_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -157,9 +157,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64-dev.conda.lock.yml b/environments/py-3.10-win-64-dev.conda.lock.yml index 0cd12edf..ce1775a2 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -39,7 +39,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.2=py310hc19bc0b_0 - - coverage=7.13.1=py310hdb0e946_0 + - coverage=7.13.2=py310hdb0e946_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py310h29418f3_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -97,7 +97,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - kiwisolver=1.4.9=py310h1e1005b_2 - krb5=1.21.3=hdf4eb48_0 - lark=1.3.1=pyhd8ed1ab_0 @@ -113,7 +113,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -156,12 +156,12 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=25.2.1=he453025_2 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=2.3.3=py310hed136d8_2 @@ -190,7 +190,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.10.19=hc20f281_2_cpython + - python=3.10.19=hc20f281_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -213,7 +213,7 @@ dependencies: - scikit-learn=1.6.1=py310hf2a6c47_0 - scipy=1.14.1=py310hbd0dde3_2 - send2trash=2.1.0=pyh6dadd2b_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -232,7 +232,7 @@ dependencies: - terminado=0.18.1=pyh6dadd2b_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -252,7 +252,7 @@ dependencies: - vc=14.3=h41ae7f8_34 - vc14_runtime=14.44.35208=h818238b_34 - vcomp14=14.44.35208=h818238b_34 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -271,9 +271,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index 801d230d..47249098 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -56,7 +56,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -88,7 +88,7 @@ dependencies: - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - packaging=26.0=pyhcf101f3_0 - pandas=2.3.3=py310hed136d8_2 - partd=1.4.2=pyhd8ed1ab_0 @@ -102,7 +102,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.10.19=hc20f281_2_cpython + - python=3.10.19=hc20f281_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -112,13 +112,13 @@ dependencies: - rtree=1.2.0=py310h08d5ad2_1 - scikit-learn=1.6.1=py310hf2a6c47_0 - scipy=1.14.1=py310hbd0dde3_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h3155e25_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.4=py310h29418f3_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -145,9 +145,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64-dev.conda.lock.yml b/environments/py-3.11-linux-64-dev.conda.lock.yml index 695cc171..0147c621 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -40,7 +40,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py311h724c32c_4 - - coverage=7.13.1=py311h3778330_0 + - coverage=7.13.2=py311h3778330_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py311h49ec1c0_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -100,7 +100,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py311h724c32c_2 - krb5=1.21.3=h659f571_0 @@ -120,7 +120,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -175,12 +175,12 @@ dependencies: - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=22.6.0=hc19f0b3_1 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311hed34c8f_1 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py311h8032f78_0 @@ -210,7 +210,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.11.14=hd63d673_2_cpython + - python=3.11.14=hd63d673_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -232,7 +232,7 @@ dependencies: - scikit-learn=1.6.1=py311h57cc02b_0 - scipy=1.14.1=py311he9a78e4_2 - send2trash=2.1.0=pyha191276_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -251,7 +251,7 @@ dependencies: - terminado=0.18.1=pyhc90fa1f_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -267,7 +267,7 @@ dependencies: - unicodedata2=17.0.0=py311h49ec1c0_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.6.3=pyhd8ed1ab_0 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -286,9 +286,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 4432b7bf..0662fd55 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -62,7 +62,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -105,7 +105,7 @@ dependencies: - numcodecs=0.15.1=py311hed34c8f_1 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py311h8032f78_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -119,7 +119,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.11.14=hd63d673_2_cpython + - python=3.11.14=hd63d673_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -129,13 +129,13 @@ dependencies: - rtree=1.2.0=py311ha1603b9_1 - scikit-learn=1.6.1=py311h57cc02b_0 - scipy=1.14.1=py311he9a78e4_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb700be7_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.3=py311h49ec1c0_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -158,9 +158,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64-dev.conda.lock.yml b/environments/py-3.11-win-64-dev.conda.lock.yml index 9c3b4a9f..f03c3618 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -39,7 +39,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py311h275cad7_4 - - coverage=7.13.1=py311h3f79411_0 + - coverage=7.13.2=py311h3f79411_0 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py311h3485c13_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -99,7 +99,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - kiwisolver=1.4.9=py311h275cad7_2 - krb5=1.21.3=hdf4eb48_0 - lark=1.3.1=pyhd8ed1ab_0 @@ -115,7 +115,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -158,12 +158,12 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=25.2.1=he453025_2 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py311h11fd7f3_1 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py311h0610301_0 @@ -191,7 +191,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.11.14=h0159041_2_cpython + - python=3.11.14=h0159041_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -214,7 +214,7 @@ dependencies: - scikit-learn=1.6.1=py311hdcb8d17_0 - scipy=1.14.1=py311hf16d85f_2 - send2trash=2.1.0=pyh6dadd2b_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -233,7 +233,7 @@ dependencies: - terminado=0.18.1=pyh6dadd2b_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -253,7 +253,7 @@ dependencies: - vc=14.3=h41ae7f8_34 - vc14_runtime=14.44.35208=h818238b_34 - vcomp14=14.44.35208=h818238b_34 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -273,9 +273,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 48cc7958..36177887 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -57,7 +57,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -89,7 +89,7 @@ dependencies: - numcodecs=0.15.1=py311h11fd7f3_1 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py311h0610301_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -103,7 +103,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.11.14=h0159041_2_cpython + - python=3.11.14=h0159041_3_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -112,13 +112,13 @@ dependencies: - rtree=1.2.0=py311h44d53c4_1 - scikit-learn=1.6.1=py311hdcb8d17_0 - scipy=1.14.1=py311hf16d85f_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h3155e25_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.4=py311h3485c13_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -146,9 +146,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 67ba415e..df2d6b31 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -41,8 +41,8 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h0a2e395_4 - - coverage=7.13.1=py312h8a5da7c_0 - - cpython=3.12.12=py312hd8ed1ab_1 + - coverage=7.13.2=py312h8a5da7c_0 + - cpython=3.12.12=py312hd8ed1ab_2 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312h4c3975b_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -102,7 +102,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - keyutils=1.6.3=hb9d3cd8_0 - kiwisolver=1.4.9=py312h0a2e395_2 - krb5=1.21.3=h659f571_0 @@ -122,7 +122,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -177,12 +177,12 @@ dependencies: - ncurses=6.5=h2d0b736_3 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=22.6.0=hc19f0b3_1 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hf79963d_1 - numpy=1.26.4=py312heda63a1_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py312h8ecdadd_0 @@ -212,10 +212,10 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.12.12=hd63d673_1_cpython + - python=3.12.12=hd63d673_2_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - - python-gil=3.12.12=hd8ed1ab_1 + - python-gil=3.12.12=hd8ed1ab_2 - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -235,7 +235,7 @@ dependencies: - scikit-learn=1.6.1=py312h7a48858_0 - scipy=1.14.1=py312h62794b6_2 - send2trash=2.1.0=pyha191276_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -254,7 +254,7 @@ dependencies: - terminado=0.18.1=pyhc90fa1f_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -270,7 +270,7 @@ dependencies: - unicodedata2=17.0.0=py312h4c3975b_1 - uri-template=1.3.0=pyhd8ed1ab_1 - urllib3=2.6.3=pyhd8ed1ab_0 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -289,9 +289,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 2723189a..15d80af8 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -62,7 +62,7 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.7.3=hecca717_0 - - libffi=3.5.2=h9ec8514_0 + - libffi=3.5.2=h3435931_0 - libfreetype=2.14.1=ha770c72_0 - libfreetype6=2.14.1=h73754d4_0 - libgcc=15.2.0=he0feb66_16 @@ -105,7 +105,7 @@ dependencies: - numcodecs=0.15.1=py312hf79963d_1 - numpy=1.26.4=py312heda63a1_0 - openjpeg=2.5.4=h55fea9a_0 - - openssl=3.6.0=h26f9b46_0 + - openssl=3.6.1=h35e630c_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py312h8ecdadd_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -119,7 +119,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyha55dd90_7 - - python=3.12.12=hd63d673_1_cpython + - python=3.12.12=hd63d673_2_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -129,13 +129,13 @@ dependencies: - rtree=1.2.0=py312h3ed4c40_1 - scikit-learn=1.6.1=py312h7a48858_0 - scipy=1.14.1=py312h62794b6_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hb700be7_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=noxft_ha0e22de_103 + - tk=8.6.13=noxft_h366c992_103 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.3=py312h4c3975b_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -158,9 +158,9 @@ dependencies: - zstd=1.5.7=hb78ec9c_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 36f7bf40..6850a5f7 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -40,8 +40,8 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.3=pyhe01879c_0 - contourpy=1.3.3=py312h78d62e6_4 - - coverage=7.13.1=py312h05f76fc_0 - - cpython=3.12.12=py312hd8ed1ab_1 + - coverage=7.13.2=py312h05f76fc_0 + - cpython=3.12.12=py312hd8ed1ab_2 - cycler=0.12.1=pyhcf101f3_2 - cytoolz=1.1.0=py312he06e257_1 - dask-core=2025.3.0=pyhd8ed1ab_0 @@ -101,7 +101,7 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.28.0=pyhcf101f3_0 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.19.0=pyh0398c0e_0 + - jupytext=1.19.1=pyhbbac1ac_0 - kiwisolver=1.4.9=py312h78d62e6_2 - krb5=1.21.3=hdf4eb48_0 - lark=1.3.1=pyhd8ed1ab_0 @@ -117,7 +117,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -160,12 +160,12 @@ dependencies: - nbformat=5.10.4=pyhd8ed1ab_1 - nest-asyncio=1.6.0=pyhd8ed1ab_1 - nodejs=25.2.1=he453025_2 - - notebook=7.5.2=pyhcf101f3_0 + - notebook=7.5.3=pyhcf101f3_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - numcodecs=0.15.1=py312hc128f0a_1 - numpy=1.26.4=py312h8753938_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py312h95189c4_0 @@ -193,10 +193,10 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=9.0.2=pyhcf101f3_0 - pytest-cov=7.0.0=pyhcf101f3_1 - - python=3.12.12=h0159041_1_cpython + - python=3.12.12=h0159041_2_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-fastjsonschema=2.21.2=pyhe01879c_0 - - python-gil=3.12.12=hd8ed1ab_1 + - python-gil=3.12.12=hd8ed1ab_2 - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -217,7 +217,7 @@ dependencies: - scikit-learn=1.6.1=py312h816cc57_0 - scipy=1.14.1=py312h337df96_2 - send2trash=2.1.0=pyh6dadd2b_0 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sniffio=1.3.1=pyhd8ed1ab_2 - snowballstemmer=3.0.1=pyhd8ed1ab_0 @@ -236,7 +236,7 @@ dependencies: - terminado=0.18.1=pyh6dadd2b_1 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.5.1=pyhcf101f3_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - tomli=2.4.0=pyhcf101f3_0 - tomlkit=0.14.0=pyha770c72_0 - toolz=1.1.0=pyhd8ed1ab_1 @@ -256,7 +256,7 @@ dependencies: - vc=14.3=h41ae7f8_34 - vc14_runtime=14.44.35208=h818238b_34 - vcomp14=14.44.35208=h818238b_34 - - wcwidth=0.2.14=pyhd8ed1ab_0 + - wcwidth=0.5.0=pyhd8ed1ab_0 - webcolors=25.10.0=pyhd8ed1ab_0 - webencodings=0.5.1=pyhd8ed1ab_3 - websocket-client=1.9.0=pyhd8ed1ab_0 @@ -276,9 +276,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index aa1d7bce..044b878f 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -57,7 +57,7 @@ dependencies: - libdeflate=1.25=h51727cc_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.3=hac47afa_0 - - libffi=3.5.2=h52bdfb6_0 + - libffi=3.5.2=h3d046cb_0 - libfreetype=2.14.1=h57928b3_0 - libfreetype6=2.14.1=hdbac1cb_0 - libgcc=15.2.0=h8ee18e1_16 @@ -89,7 +89,7 @@ dependencies: - numcodecs=0.15.1=py312hc128f0a_1 - numpy=1.26.4=py312h8753938_0 - openjpeg=2.5.4=h24db6dd_0 - - openssl=3.6.0=h725018a_0 + - openssl=3.6.1=hf411b9b_1 - packaging=26.0=pyhcf101f3_0 - pandas=3.0.0=py312h95189c4_0 - partd=1.4.2=pyhd8ed1ab_0 @@ -103,7 +103,7 @@ dependencies: - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.3.2=pyhcf101f3_0 - pysocks=1.7.1=pyh09c184e_7 - - python=3.12.12=h0159041_1_cpython + - python=3.12.12=h0159041_2_cpython - python-dateutil=2.9.0.post0=pyhe01879c_2 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.3=pyhd8ed1ab_0 @@ -112,13 +112,13 @@ dependencies: - rtree=1.2.0=py312h50e5f8f_1 - scikit-learn=1.6.1=py312h816cc57_0 - scipy=1.14.1=py312h337df96_2 - - setuptools=80.10.1=pyh332efcf_0 + - setuptools=80.10.2=pyh332efcf_0 - six=1.17.0=pyhe01879c_1 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h3155e25_5 - tblib=3.2.2=pyhcf101f3_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - - tk=8.6.13=h2c6b04d_3 + - tk=8.6.13=h6ed50ae_3 - toolz=1.1.0=pyhd8ed1ab_1 - tornado=6.5.4=py312he06e257_0 - tqdm=4.67.1=pyhd8ed1ab_1 @@ -146,9 +146,9 @@ dependencies: - zstd=1.5.7=h534d264_6 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@3f02228742b4837bd456438081d0a128fc3e1b3a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@99e51cbe794114ce08ab3bb16efcc6749b14914a - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index ea5dafb1..af0ee353 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -954,7 +954,7 @@ package: category: main optional: false - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: linux-64 dependencies: @@ -963,14 +963,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.1-py310h3406613_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.2-py310h3406613_0.conda hash: - md5: c41ab071ecc2686b335edcfcb0727f87 - sha256: 34d5256bc19c95a1476385d5e5299da34bb660f010d8d5f6174e9ebd55775441 + md5: e0be08915e346de9a1308c2c9baa865f + sha256: 05c3273fe4bb366f141226fd30dd25c90597c5216fa2bc0503440ab294312841 category: dev optional: true - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: win-64 dependencies: @@ -980,10 +980,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.1-py310hdb0e946_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.2-py310hdb0e946_0.conda hash: - md5: c18c8bcf244eb8fccceb05721ffc6993 - sha256: c15026595e3ad8d7d9061df0ebc930e12ddb9a5aaf0781aee50c221ced9a6716 + md5: ac471eedbfd46eecb4675bd43157f692 + sha256: 983a044621556175c8a851dc2b1e5bfd35988acbd8f23fe9c9ec6854913c6a88 category: dev optional: true - name: cycler @@ -2755,7 +2755,7 @@ package: category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: linux-64 dependencies: @@ -2766,14 +2766,14 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: win-64 dependencies: @@ -2784,10 +2784,10 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: keyutils @@ -3272,10 +3272,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h9ec8514_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h3435931_0.conda hash: - md5: 35f29eec58405aaf55e01cb470d8c26a - sha256: 25cbdfa65580cfab1b8d15ee90b4c9f1e0d72128f1661449c9a999d341377d54 + md5: a360c33a5abe61c07959e449fa1453eb + sha256: 31f19b6a88ce40ebc0d5a992c131f57d919f73c0b92cd1617a5bec83f6e961e6 category: main optional: false - name: libffi @@ -3286,10 +3286,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h52bdfb6_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h3d046cb_0.conda hash: - md5: ba4ad812d2afc22b9a34ce8327a0930f - sha256: ddff25aaa4f0aa535413f5d831b04073789522890a4d8626366e43ecde1534a3 + md5: 720b39f5ec0610457b725eb3f396219a + sha256: 59d01f2dfa8b77491b5888a5ab88ff4e1574c9359f7e229da254cdfe27ddc190 category: main optional: false - name: libfreetype @@ -4697,39 +4697,39 @@ package: category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook-shim @@ -4866,21 +4866,21 @@ package: category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.0-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.1-h35e630c_1.conda hash: - md5: 9ee58d5c534af06558933af3c845a780 - sha256: a47271202f4518a484956968335b2521409c8173e123ab381e775c358c67fe6d + md5: f61eb8cd60ff9057122a3d338b99c00f + sha256: 44c877f8af015332a5d12f5ff0fb20ca32f896526a7d0cdb30c769df1144fb5c category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: win-64 dependencies: @@ -4888,10 +4888,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.0-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.1-hf411b9b_1.conda hash: - md5: 84f8fb4afd1157f59098f618cd2437e4 - sha256: 6d72d6f766293d4f2aa60c28c244c8efed6946c430814175f959ffe8cab899b3 + md5: eb585509b815415bc964b2c7e11c7eb3 + sha256: 53a5ad2e5553b8157a91bb8aa375f78c5958f77cb80e9d2ce59471ea8e5c0bd6 category: main optional: false - name: overrides @@ -5738,25 +5738,25 @@ package: __glibc: '>=2.17,<3.0.a0' bzip2: '>=1.0.8,<2.0a0' ld_impl_linux-64: '>=2.36.1' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.4,<4.0a0' libgcc: '>=14' - liblzma: '>=5.8.1,<6.0a0' + liblzma: '>=5.8.2,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.50.4,<4.0a0' - libuuid: '>=2.41.2,<3.0a0' + libsqlite: '>=3.51.2,<4.0a0' + libuuid: '>=2.41.3,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' - readline: '>=8.2,<9.0a0' + readline: '>=8.3,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://repo.prefix.dev/conda-forge/linux-64/python-3.10.19-h3c07f61_2_cpython.conda + url: https://repo.prefix.dev/conda-forge/linux-64/python-3.10.19-h3c07f61_3_cpython.conda hash: - md5: 27ac896a8b4970f8977503a9e70dc745 - sha256: 6e3b6b69b3cacfc7610155d58407a003820eaacd50fbe039abff52b5e70b1e9b + md5: be48679ccfbc8710dea1d5970600fa04 + sha256: 2d8b5566d82c3872f057661e056d696f2f77a17ee5a36d9ae6ec43052c4d1c51 category: main optional: false - name: python @@ -5765,10 +5765,10 @@ package: platform: win-64 dependencies: bzip2: '>=1.0.8,<2.0a0' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.4,<4.0a0' - liblzma: '>=5.8.1,<6.0a0' - libsqlite: '>=3.50.4,<4.0a0' + liblzma: '>=5.8.2,<6.0a0' + libsqlite: '>=3.51.2,<4.0a0' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' @@ -5777,10 +5777,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/python-3.10.19-hc20f281_2_cpython.conda + url: https://repo.prefix.dev/conda-forge/win-64/python-3.10.19-hc20f281_3_cpython.conda hash: - md5: cd78c55405743e88fda2464be3c902b3 - sha256: 58c3066571c9c8ba62254dfa1cee696d053f9f78cd3a92c8032af58232610c32 + md5: 7be098c303e842443528587a5b2297f1 + sha256: 77cbf9ab8e6c9f67e645b00a3224f35c92333fd9a737f5e53ef7060d0604c4cb category: main optional: false - name: python-dateutil @@ -6416,27 +6416,27 @@ package: category: dev optional: true - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: six @@ -6941,12 +6941,12 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_ha0e22de_103.conda + url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_h366c992_103.conda hash: - md5: 86bc20552bf46075e3d92b67f089172d - sha256: 1544760538a40bcd8ace2b1d8ebe3eb5807ac268641f8acdc18c69c5ebfeaf64 + md5: cffd3bdd58090148f4cfcd831f4b26ab + sha256: cafeec44494f842ffeca27e9c8b0c27ed714f93ac77ddadc6aaf726b5554ebac category: main optional: false - name: tk @@ -6955,12 +6955,12 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h2c6b04d_3.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h6ed50ae_3.conda hash: - md5: 7cb36e506a7dba4817970f8adb6396f9 - sha256: 4581f4ffb432fefa1ac4f85c5682cc27014bcd66e7beaa0ee330e927a7858790 + md5: 0481bfd9814bf525bd4b3ee4b51494c4 + sha256: 0e79810fae28f3b69fe7391b0d43f5474d6bd91d451d5f2bde02f55ae481d5e3 category: main optional: false - name: tomli @@ -7398,27 +7398,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: webcolors @@ -7833,7 +7833,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -7851,7 +7851,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -7865,7 +7865,7 @@ package: category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: linux-64 dependencies: @@ -7873,16 +7873,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: win-64 dependencies: @@ -7890,12 +7890,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: grid-apps @@ -7905,7 +7905,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -7924,7 +7924,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -7937,7 +7937,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: linux-64 dependencies: @@ -7950,16 +7950,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: win-64 dependencies: @@ -7972,11 +7972,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index d775a6ba..cd8c22ac 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -952,7 +952,7 @@ package: category: main optional: false - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: linux-64 dependencies: @@ -961,14 +961,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.1-py311h3778330_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.2-py311h3778330_0.conda hash: - md5: 9d38ee59f3535da3ee59652dcef8fd96 - sha256: 86a8776cf59368a34133ab6328075a9b3c1b7fb51ca514d2441ef760098555cf + md5: b25c1e3463dde575d6701b8dee76d965 + sha256: ebbe8fbe667e871d6a060bf31126f3b91f9f85d9c097f037e79f59b334ef4ca1 category: dev optional: true - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: win-64 dependencies: @@ -978,10 +978,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.1-py311h3f79411_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.2-py311h3f79411_0.conda hash: - md5: 2bc1a645fd4c574855277c6ab0061f49 - sha256: b61300f016be6bc7e2e06c603b5d23245958207ce829a466de32135f441f6670 + md5: 7483b07166c6fad6544dab8709988180 + sha256: 7dc42e8025e8c163ceb445fc81ede7c041e928d3e2f34fb8d6d8e5b769d0015c category: dev optional: true - name: cycler @@ -2803,7 +2803,7 @@ package: category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: linux-64 dependencies: @@ -2814,14 +2814,14 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: win-64 dependencies: @@ -2832,10 +2832,10 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: keyutils @@ -3320,10 +3320,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h9ec8514_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h3435931_0.conda hash: - md5: 35f29eec58405aaf55e01cb470d8c26a - sha256: 25cbdfa65580cfab1b8d15ee90b4c9f1e0d72128f1661449c9a999d341377d54 + md5: a360c33a5abe61c07959e449fa1453eb + sha256: 31f19b6a88ce40ebc0d5a992c131f57d919f73c0b92cd1617a5bec83f6e961e6 category: main optional: false - name: libffi @@ -3334,10 +3334,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h52bdfb6_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h3d046cb_0.conda hash: - md5: ba4ad812d2afc22b9a34ce8327a0930f - sha256: ddff25aaa4f0aa535413f5d831b04073789522890a4d8626366e43ecde1534a3 + md5: 720b39f5ec0610457b725eb3f396219a + sha256: 59d01f2dfa8b77491b5888a5ab88ff4e1574c9359f7e229da254cdfe27ddc190 category: main optional: false - name: libfreetype @@ -4745,39 +4745,39 @@ package: category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook-shim @@ -4918,21 +4918,21 @@ package: category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.0-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.1-h35e630c_1.conda hash: - md5: 9ee58d5c534af06558933af3c845a780 - sha256: a47271202f4518a484956968335b2521409c8173e123ab381e775c358c67fe6d + md5: f61eb8cd60ff9057122a3d338b99c00f + sha256: 44c877f8af015332a5d12f5ff0fb20ca32f896526a7d0cdb30c769df1144fb5c category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: win-64 dependencies: @@ -4940,10 +4940,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.0-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.1-hf411b9b_1.conda hash: - md5: 84f8fb4afd1157f59098f618cd2437e4 - sha256: 6d72d6f766293d4f2aa60c28c244c8efed6946c430814175f959ffe8cab899b3 + md5: eb585509b815415bc964b2c7e11c7eb3 + sha256: 53a5ad2e5553b8157a91bb8aa375f78c5958f77cb80e9d2ce59471ea8e5c0bd6 category: main optional: false - name: overrides @@ -5763,25 +5763,25 @@ package: __glibc: '>=2.17,<3.0.a0' bzip2: '>=1.0.8,<2.0a0' ld_impl_linux-64: '>=2.36.1' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.5.2,<3.6.0a0' libgcc: '>=14' - liblzma: '>=5.8.1,<6.0a0' + liblzma: '>=5.8.2,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.50.4,<4.0a0' - libuuid: '>=2.41.2,<3.0a0' + libsqlite: '>=3.51.2,<4.0a0' + libuuid: '>=2.41.3,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' - readline: '>=8.2,<9.0a0' + readline: '>=8.3,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://repo.prefix.dev/conda-forge/linux-64/python-3.11.14-hd63d673_2_cpython.conda + url: https://repo.prefix.dev/conda-forge/linux-64/python-3.11.14-hd63d673_3_cpython.conda hash: - md5: c4202a55b4486314fbb8c11bc43a29a0 - sha256: 5b872f7747891e50e990a96d2b235236a5c66cc9f8c9dcb7149aee674ea8145a + md5: 26d8f4db8c578dedba9f2c11423e59e5 + sha256: 41b29c2d62f7028bb7bb05eef3ff55f81e3c1cb40e76ba95a890a058fbc2a896 category: main optional: false - name: python @@ -5790,10 +5790,10 @@ package: platform: win-64 dependencies: bzip2: '>=1.0.8,<2.0a0' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.5.2,<3.6.0a0' - liblzma: '>=5.8.1,<6.0a0' - libsqlite: '>=3.50.4,<4.0a0' + liblzma: '>=5.8.2,<6.0a0' + libsqlite: '>=3.51.2,<4.0a0' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' @@ -5802,10 +5802,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/python-3.11.14-h0159041_2_cpython.conda + url: https://repo.prefix.dev/conda-forge/win-64/python-3.11.14-h0159041_3_cpython.conda hash: - md5: 02a9ba5950d8b78e6c9862d6ba7a5045 - sha256: d5f455472597aefcdde1bc39bca313fcb40bf084f3ad987da0441f2a2ec242e4 + md5: 05ded1dca7befb66ec95a9ec6d34a71a + sha256: 5676dadd9d4fba1bce51bd7e5cf8fcf76f85b88b7baa15bd10ca00557e67f10e category: main optional: false - name: python-dateutil @@ -6441,27 +6441,27 @@ package: category: dev optional: true - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: six @@ -6966,12 +6966,12 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_ha0e22de_103.conda + url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_h366c992_103.conda hash: - md5: 86bc20552bf46075e3d92b67f089172d - sha256: 1544760538a40bcd8ace2b1d8ebe3eb5807ac268641f8acdc18c69c5ebfeaf64 + md5: cffd3bdd58090148f4cfcd831f4b26ab + sha256: cafeec44494f842ffeca27e9c8b0c27ed714f93ac77ddadc6aaf726b5554ebac category: main optional: false - name: tk @@ -6980,12 +6980,12 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h2c6b04d_3.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h6ed50ae_3.conda hash: - md5: 7cb36e506a7dba4817970f8adb6396f9 - sha256: 4581f4ffb432fefa1ac4f85c5682cc27014bcd66e7beaa0ee330e927a7858790 + md5: 0481bfd9814bf525bd4b3ee4b51494c4 + sha256: 0e79810fae28f3b69fe7391b0d43f5474d6bd91d451d5f2bde02f55ae481d5e3 category: main optional: false - name: tomli @@ -7423,27 +7423,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: webcolors @@ -7889,7 +7889,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -7907,7 +7907,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -7921,7 +7921,7 @@ package: category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: linux-64 dependencies: @@ -7929,16 +7929,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: win-64 dependencies: @@ -7946,12 +7946,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: grid-apps @@ -7961,7 +7961,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -7980,7 +7980,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -7993,7 +7993,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: linux-64 dependencies: @@ -8006,16 +8006,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: win-64 dependencies: @@ -8028,11 +8028,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 9d1b1920..6d983c60 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -978,7 +978,7 @@ package: category: main optional: false - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: linux-64 dependencies: @@ -987,14 +987,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* tomli: '' - url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.1-py312h8a5da7c_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/coverage-7.13.2-py312h8a5da7c_0.conda hash: - md5: eafe0b486a7910e4a6973029c80d437f - sha256: dd832f036d8aefed827b79f9b5fab94b807f97979c5339c0deebeceab4c032b5 + md5: 3935daadad011d007deb379b8188588d + sha256: a646df44607339ab4739b221f955e431431d7b3126215d08209446811f30dd15 category: dev optional: true - name: coverage - version: 7.13.1 + version: 7.13.2 manager: conda platform: win-64 dependencies: @@ -1004,10 +1004,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.1-py312h05f76fc_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/coverage-7.13.2-py312h05f76fc_0.conda hash: - md5: a0f9698c7e9a2ba93218b65aaff9dcb9 - sha256: 20e7019e3bfdb5ce1ddb79753c7f0edb40a9983e4d40b3efd4b8277980fda8d1 + md5: 27272967648cb44cf3759fb9fb39a69b + sha256: 76f07cbf763b3ec85f2355a31213ea828eef485a616b2aa00e86f27ed4ae954c category: dev optional: true - name: cpython @@ -1017,10 +1017,10 @@ package: dependencies: python: '>=3.12,<3.13.0a0' python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.12-py312hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.12-py312hd8ed1ab_2.conda hash: - md5: 99d689ccc1a360639eec979fd7805be9 - sha256: b88c76a6d6b45378552ccfd9e88b2a073161fe83fd1294c8fa103ffd32f7934a + md5: ef3e093ecfd4533eee992cdaa155b47e + sha256: ccb90d95bac9f1f4f6629a4addb44d36433e4ad1fe4ac87a864f90ff305dbf6d category: dev optional: true - name: cpython @@ -1030,10 +1030,10 @@ package: dependencies: python: '>=3.12,<3.13.0a0' python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.12-py312hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/cpython-3.12.12-py312hd8ed1ab_2.conda hash: - md5: 99d689ccc1a360639eec979fd7805be9 - sha256: b88c76a6d6b45378552ccfd9e88b2a073161fe83fd1294c8fa103ffd32f7934a + md5: ef3e093ecfd4533eee992cdaa155b47e + sha256: ccb90d95bac9f1f4f6629a4addb44d36433e4ad1fe4ac87a864f90ff305dbf6d category: dev optional: true - name: cycler @@ -2855,7 +2855,7 @@ package: category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: linux-64 dependencies: @@ -2866,14 +2866,14 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: jupytext - version: 1.19.0 + version: 1.19.1 manager: conda platform: win-64 dependencies: @@ -2884,10 +2884,10 @@ package: python: '>=3.10' pyyaml: '' tomli: '' - url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.0-pyh0398c0e_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/jupytext-1.19.1-pyhbbac1ac_0.conda hash: - md5: 1831f8fcb080707636343f5e1d8994f1 - sha256: 76f1c795088c7ad8b899ee388aafe69d3412ff11d5ca628fff0b655fbb31de05 + md5: d8f030e3730713c93a358fdb46f08281 + sha256: 1027cf4d0eb0c40f36de9e9b78bcdc7edc17b62ff9e7a20ad6bc81422f30713c category: dev optional: true - name: keyutils @@ -3372,10 +3372,10 @@ package: dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h9ec8514_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/libffi-3.5.2-h3435931_0.conda hash: - md5: 35f29eec58405aaf55e01cb470d8c26a - sha256: 25cbdfa65580cfab1b8d15ee90b4c9f1e0d72128f1661449c9a999d341377d54 + md5: a360c33a5abe61c07959e449fa1453eb + sha256: 31f19b6a88ce40ebc0d5a992c131f57d919f73c0b92cd1617a5bec83f6e961e6 category: main optional: false - name: libffi @@ -3386,10 +3386,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h52bdfb6_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/libffi-3.5.2-h3d046cb_0.conda hash: - md5: ba4ad812d2afc22b9a34ce8327a0930f - sha256: ddff25aaa4f0aa535413f5d831b04073789522890a4d8626366e43ecde1534a3 + md5: 720b39f5ec0610457b725eb3f396219a + sha256: 59d01f2dfa8b77491b5888a5ab88ff4e1574c9359f7e229da254cdfe27ddc190 category: main optional: false - name: libfreetype @@ -4797,39 +4797,39 @@ package: category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: linux-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook - version: 7.5.2 + version: 7.5.3 manager: conda platform: win-64 dependencies: importlib_resources: '>=5.0' jupyter_server: '>=2.4.0,<3' - jupyterlab: '>=4.5.2,<4.6' + jupyterlab: '>=4.5.3,<4.6' jupyterlab_server: '>=2.28.0,<3' notebook-shim: '>=0.2,<0.3' python: '>=3.10' tornado: '>=6.2.0' - url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.2-pyhcf101f3_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/notebook-7.5.3-pyhcf101f3_0.conda hash: - md5: 47b58fa741a608dac785b71b8083bdb7 - sha256: 05bda90b7a980593c5e955dec5c556ff4dabf56e6ff45a3fb6c670f5f20b11e6 + md5: 94a5f0cee51b6b0ffdcad0af6db0af18 + sha256: 014cf291843861b20cf84a89e8450f0dd13ad1e6d2ab30c56ae43b81f2dca233 category: dev optional: true - name: notebook-shim @@ -4970,21 +4970,21 @@ package: category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=14' - url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.0-h26f9b46_0.conda + url: https://repo.prefix.dev/conda-forge/linux-64/openssl-3.6.1-h35e630c_1.conda hash: - md5: 9ee58d5c534af06558933af3c845a780 - sha256: a47271202f4518a484956968335b2521409c8173e123ab381e775c358c67fe6d + md5: f61eb8cd60ff9057122a3d338b99c00f + sha256: 44c877f8af015332a5d12f5ff0fb20ca32f896526a7d0cdb30c769df1144fb5c category: main optional: false - name: openssl - version: 3.6.0 + version: 3.6.1 manager: conda platform: win-64 dependencies: @@ -4992,10 +4992,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.0-h725018a_0.conda + url: https://repo.prefix.dev/conda-forge/win-64/openssl-3.6.1-hf411b9b_1.conda hash: - md5: 84f8fb4afd1157f59098f618cd2437e4 - sha256: 6d72d6f766293d4f2aa60c28c244c8efed6946c430814175f959ffe8cab899b3 + md5: eb585509b815415bc964b2c7e11c7eb3 + sha256: 53a5ad2e5553b8157a91bb8aa375f78c5958f77cb80e9d2ce59471ea8e5c0bd6 category: main optional: false - name: overrides @@ -5815,25 +5815,25 @@ package: __glibc: '>=2.17,<3.0.a0' bzip2: '>=1.0.8,<2.0a0' ld_impl_linux-64: '>=2.36.1' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.5.2,<3.6.0a0' libgcc: '>=14' - liblzma: '>=5.8.1,<6.0a0' + liblzma: '>=5.8.2,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.50.4,<4.0a0' - libuuid: '>=2.41.2,<3.0a0' + libsqlite: '>=3.51.2,<4.0a0' + libuuid: '>=2.41.3,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' - readline: '>=8.2,<9.0a0' + readline: '>=8.3,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://repo.prefix.dev/conda-forge/linux-64/python-3.12.12-hd63d673_1_cpython.conda + url: https://repo.prefix.dev/conda-forge/linux-64/python-3.12.12-hd63d673_2_cpython.conda hash: - md5: 5c00c8cea14ee8d02941cab9121dce41 - sha256: 39898d24769a848c057ab861052e50bdc266310a7509efa3514b840e85a2ae98 + md5: c4540d3de3fa228d9fa95e31f8e97f89 + sha256: 6621befd6570a216ba94bc34ec4618e4f3777de55ad0adc15fc23c28fadd4d1a category: main optional: false - name: python @@ -5842,10 +5842,10 @@ package: platform: win-64 dependencies: bzip2: '>=1.0.8,<2.0a0' - libexpat: '>=2.7.1,<3.0a0' + libexpat: '>=2.7.3,<3.0a0' libffi: '>=3.5.2,<3.6.0a0' - liblzma: '>=5.8.1,<6.0a0' - libsqlite: '>=3.50.4,<4.0a0' + liblzma: '>=5.8.2,<6.0a0' + libsqlite: '>=3.51.2,<4.0a0' libzlib: '>=1.3.1,<2.0a0' openssl: '>=3.5.4,<4.0a0' pip: '' @@ -5854,10 +5854,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.3,<15' vc14_runtime: '>=14.44.35208' - url: https://repo.prefix.dev/conda-forge/win-64/python-3.12.12-h0159041_1_cpython.conda + url: https://repo.prefix.dev/conda-forge/win-64/python-3.12.12-h0159041_2_cpython.conda hash: - md5: 42ae551e4c15837a582bea63412dc0b4 - sha256: 9b163b0426c92eee1881d5c838e230a750a3fa372092db494772886ab91c2548 + md5: 068897f82240d69580c2d93f93b56ff5 + sha256: 5937ab50dfeb979f7405132f73e836a29690f21162308b95b240b8037aa99975 category: main optional: false - name: python-dateutil @@ -5917,10 +5917,10 @@ package: dependencies: cpython: 3.12.12.* python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.12-hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.12-hd8ed1ab_2.conda hash: - md5: c20172b4c59fbe288fa50cdc1b693d73 - sha256: 59f17182813f8b23709b7d4cfda82c33b72dd007cb729efa0033c609fbd92122 + md5: d41b6b394546ee6e1c423e28a581fc71 + sha256: 3307c01627ae45524dfbdb149f7801818608c9c49d88ac89632dff32e149057f category: dev optional: true - name: python-gil @@ -5930,10 +5930,10 @@ package: dependencies: cpython: 3.12.12.* python_abi: '*' - url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.12-hd8ed1ab_1.conda + url: https://repo.prefix.dev/conda-forge/noarch/python-gil-3.12.12-hd8ed1ab_2.conda hash: - md5: c20172b4c59fbe288fa50cdc1b693d73 - sha256: 59f17182813f8b23709b7d4cfda82c33b72dd007cb729efa0033c609fbd92122 + md5: d41b6b394546ee6e1c423e28a581fc71 + sha256: 3307c01627ae45524dfbdb149f7801818608c9c49d88ac89632dff32e149057f category: dev optional: true - name: python-json-logger @@ -6521,27 +6521,27 @@ package: category: dev optional: true - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: setuptools - version: 80.10.1 + version: 80.10.2 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.1-pyh332efcf_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/setuptools-80.10.2-pyh332efcf_0.conda hash: - md5: cb72cedd94dd923c6a9405a3d3b1c018 - sha256: 89d5bb48047e7e27aa52a3a71d6ebf386e5ee4bdbd7ca91d653df9977eca8253 + md5: 7b446fcbb6779ee479debb4fd7453e6c + sha256: f5fcb7854d2b7639a5b1aca41dd0f2d5a69a60bbc313e7f192e2dc385ca52f86 category: main optional: false - name: six @@ -7046,12 +7046,12 @@ package: platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' + libgcc: '>=14' libzlib: '>=1.3.1,<2.0a0' - url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_ha0e22de_103.conda + url: https://repo.prefix.dev/conda-forge/linux-64/tk-8.6.13-noxft_h366c992_103.conda hash: - md5: 86bc20552bf46075e3d92b67f089172d - sha256: 1544760538a40bcd8ace2b1d8ebe3eb5807ac268641f8acdc18c69c5ebfeaf64 + md5: cffd3bdd58090148f4cfcd831f4b26ab + sha256: cafeec44494f842ffeca27e9c8b0c27ed714f93ac77ddadc6aaf726b5554ebac category: main optional: false - name: tk @@ -7060,12 +7060,12 @@ package: platform: win-64 dependencies: ucrt: '>=10.0.20348.0' - vc: '>=14.2,<15' - vc14_runtime: '>=14.29.30139' - url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h2c6b04d_3.conda + vc: '>=14.3,<15' + vc14_runtime: '>=14.44.35208' + url: https://repo.prefix.dev/conda-forge/win-64/tk-8.6.13-h6ed50ae_3.conda hash: - md5: 7cb36e506a7dba4817970f8adb6396f9 - sha256: 4581f4ffb432fefa1ac4f85c5682cc27014bcd66e7beaa0ee330e927a7858790 + md5: 0481bfd9814bf525bd4b3ee4b51494c4 + sha256: 0e79810fae28f3b69fe7391b0d43f5474d6bd91d451d5f2bde02f55ae481d5e3 category: main optional: false - name: tomli @@ -7503,27 +7503,27 @@ package: category: main optional: false - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: linux-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: wcwidth - version: 0.2.14 + version: 0.5.0 manager: conda platform: win-64 dependencies: python: '>=3.10' - url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.2.14-pyhd8ed1ab_0.conda + url: https://repo.prefix.dev/conda-forge/noarch/wcwidth-0.5.0-pyhd8ed1ab_0.conda hash: - md5: 7e1e5ff31239f9cd5855714df8a3783d - sha256: e311b64e46c6739e2a35ab8582c20fa30eb608da130625ed379f4467219d4813 + md5: 7ad8004c0115a5e73b65e0b8b94a8d75 + sha256: 6186c0db018297419727ad390bd1678a5a82bb6b254e414aa2c0de610a6cf342 category: dev optional: true - name: webcolors @@ -7969,7 +7969,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -7987,7 +7987,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b matplotlib: '>=3.8.4,<3.9.0' numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' @@ -8001,7 +8001,7 @@ package: category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: linux-64 dependencies: @@ -8009,16 +8009,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: geoh5py - version: 0.13.0a2.dev90+689e16d4 + version: 0.13.0a2.dev101+4ba1b79b manager: pip platform: win-64 dependencies: @@ -8026,12 +8026,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.12.0,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e hash: - sha256: 689e16d471a2f6a3ccfbbc921292c1e0387e2413 + sha256: 4ba1b79b60b6e6615860d4a786d28b433007824e source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@689e16d471a2f6a3ccfbbc921292c1e0387e2413 + url: git+https://github.com/MiraGeoscience/geoh5py.git@4ba1b79b60b6e6615860d4a786d28b433007824e category: main optional: false - name: grid-apps @@ -8041,7 +8041,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8060,7 +8060,7 @@ package: dependencies: discretize: '>=0.11.0,<0.12.dev' geoapps-utils: 0.7.0a2.dev11+3f02228 - geoh5py: 0.13.0a2.dev90+689e16d4 + geoh5py: 0.13.0a2.dev101+4ba1b79b numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.12.0,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8073,7 +8073,7 @@ package: category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: linux-64 dependencies: @@ -8086,16 +8086,16 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false - name: mira-simpeg - version: 0.23.0.3a1.dev107+g1cf096ddf + version: 0.23.0.3a1.dev111+g17c25f9b0 manager: pip platform: win-64 dependencies: @@ -8108,11 +8108,11 @@ package: pymatsolver: '>=0.3' scipy: '>=1.8' typing-extensions: '*' - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b hash: - sha256: 1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + sha256: 17c25f9b01cd385fd1206e1f5754ed9e31bb519b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@1cf096ddfe44da149fecbb53d6f6e97fae3c23ae + url: git+https://github.com/MiraGeoscience/simpeg.git@17c25f9b01cd385fd1206e1f5754ed9e31bb519b category: main optional: false diff --git a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json index 060217ba..b919c9e7 100644 --- a/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_2d_inversion.ui.json @@ -387,13 +387,13 @@ "enabled": true, "tooltip": "The global target data misfit value." }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor." + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json index e543ac9a..8ae10380 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_inversion.ui.json @@ -357,13 +357,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json index d793940c..eea2fd30 100644 --- a/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_batch2d_inversion.ui.json @@ -368,13 +368,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index fe8a1584..e80f0797 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -392,13 +392,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": false, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json index d646f052..82f50d48 100644 --- a/simpeg_drivers-assets/uijson/fdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem_inversion.ui.json @@ -393,13 +393,21 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." + }, + "auto_scale_channels": { + "group": "Cooling schedule/target", + "label": "Auto-scale frequencies", + "value": false, + "verbose": 3, + "visible": true, + "tooltip": "Whether to auto-scale frequencies based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json index 74b130b6..db5d060c 100644 --- a/simpeg_drivers-assets/uijson/gravity_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/gravity_inversion.ui.json @@ -626,13 +626,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 33a35ab9..1e679ef4 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -398,13 +398,13 @@ "enabled": true, "tooltip": "The global target data misfit value." }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor." + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index e0769770..3b997672 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -373,13 +373,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index 3ea8e544..cfc61c6c 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -380,13 +380,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index 4fa16cfc..a852f4dd 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -321,7 +321,7 @@ "value": true, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale misfits functions of joint methods based on chi-factor" }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json index a3c3c2d6..b1149c05 100644 --- a/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_petrophysics_inversion.ui.json @@ -289,7 +289,7 @@ "value": true, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale misfits functions of joint methods based on chi-factor" }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 1ab64afa..73337d62 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -370,7 +370,7 @@ "value": true, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale misfits functions of joint methods based on chi-factor" }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index f37e0fa5..673ab5b1 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -659,13 +659,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index 084387d9..53bd286e 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -724,13 +724,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json index 64f40d8e..449951c9 100644 --- a/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetotellurics_inversion.ui.json @@ -578,13 +578,21 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." + }, + "auto_scale_channels": { + "group": "Cooling schedule/target", + "label": "Auto-scale frequencies", + "value": false, + "verbose": 3, + "visible": true, + "tooltip": "Whether to auto-scale frequencies based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index 77eebdca..f50f403f 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -377,13 +377,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": false, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json index 126d44e0..f8184da1 100644 --- a/simpeg_drivers-assets/uijson/tdem_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem_inversion.ui.json @@ -437,13 +437,13 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json index ecd58b39..5e530251 100644 --- a/simpeg_drivers-assets/uijson/tipper_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tipper_inversion.ui.json @@ -458,13 +458,21 @@ "enabled": true, "tooltip": "The global target data misfit value" }, - "auto_scale_misfits": { + "auto_scale_tiles": { "group": "Cooling schedule/target", - "label": "Auto-scale misfits", + "label": "Auto-scale tiles", "value": false, "verbose": 3, "visible": true, - "tooltip": "Whether to auto-scale misfits functions (tile, frequency, joint methods) based on chi-factor" + "tooltip": "Whether to auto-scale the misfit function of tiles based on chi-factor." + }, + "auto_scale_channels": { + "group": "Cooling schedule/target", + "label": "Auto-scale frequencies", + "value": false, + "verbose": 3, + "visible": true, + "tooltip": "Whether to auto-scale frequencies based on chi-factor." }, "initial_beta_ratio": { "min": 0.0, diff --git a/simpeg_drivers/components/factories/directives_factory.py b/simpeg_drivers/components/factories/directives_factory.py index 80472a84..af16d6b5 100644 --- a/simpeg_drivers/components/factories/directives_factory.py +++ b/simpeg_drivers/components/factories/directives_factory.py @@ -269,11 +269,17 @@ def save_iteration_residual_directive(self): def scale_misfits(self): if ( self._scale_misfits is None - and self.params.directives.auto_scale_misfits + and any( + getattr(self.params.directives, f"auto_scale_{val}", False) + for val in ["tiles", "channels", "misfits"] + ) and len(self.driver.data_misfit.objfcts) > 1 ): + nested_tiles = self.driver.get_nested_tiles() self._scale_misfits = directives.ScaleMisfitMultipliers( - self.params.geoh5.h5file.parent + self.params.geoh5.h5file.parent, + nested_tiles, + target_chi=self.params.cooling_schedule.chi_factor, ) return self._scale_misfits diff --git a/simpeg_drivers/components/factories/misfit_factory.py b/simpeg_drivers/components/factories/misfit_factory.py index 1db4db68..a9069b75 100644 --- a/simpeg_drivers/components/factories/misfit_factory.py +++ b/simpeg_drivers/components/factories/misfit_factory.py @@ -16,7 +16,7 @@ from typing import TYPE_CHECKING import numpy as np -from dask.distributed import wait +from dask.distributed import Client, wait from simpeg import objective_function from simpeg.dask import objective_function as dask_objective_function from simpeg.objective_function import ComboObjectiveFunction @@ -30,16 +30,26 @@ class MisfitFactory(SimPEGFactory): - """Build SimPEG global misfit function.""" - - def __init__(self, params, client, simulation, workers): - """ - :param params: Options object containing SimPEG object parameters. - """ + """ + Build SimPEG global misfit function + + + :param params: Options object containing SimPEG object parameters. + :param simulation: SimPEG simulation object. + :param client: Dask client or boolean to indicate whether to use dask. + :param workers: List of worker addresses to use for dask computations. + """ + + def __init__( + self, + params, + simulation, + client: Client | bool, + workers: list[tuple[str]], + ): super().__init__(params) self.simpeg_object = self.concrete_object() - self.factory_type = self.params.inversion_type self.simulation = simulation self.client = client self.workers = workers @@ -48,14 +58,9 @@ def concrete_object(self): return objective_function.ComboObjectiveFunction def assemble_arguments( # pylint: disable=arguments-differ - self, tiles + self, + tiles: dict[str, list[np.ndarray]], ): - # Base slice over frequencies - if self.factory_type in ["magnetotellurics", "tipper", "fdem"]: - channels = self.simulation.survey.frequencies - else: - channels = [None] - use_futures = self.client # Pickle the simulation to the temporary file @@ -66,20 +71,19 @@ def assemble_arguments( # pylint: disable=arguments-differ misfits = [] tile_count = 0 - for channel in channels: - for local_indices in tiles: - for sub_ind in local_indices: - if len(sub_ind) == 0: - continue + for channel, tile_list in tiles.items(): + for tile in tile_list: + # Split again but use the same mesh extent based on tile vertices + for sub_indices in tile: args = ( - sub_ind, + sub_indices, temp_file.name, channel, tile_count, self.params.padding_cells, self.params.forward_only, - np.hstack(local_indices), + np.hstack(tile), ) # Distribute the work across workers round-robin style if use_futures: diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 95aff126..d8f91dc1 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -103,7 +103,7 @@ def __init__( "Disk storage of sensitivities is not compatible with distributed processing." ) - self._workers: list[tuple[str]] | None = self.validate_workers(workers) + self._workers: list[tuple[str]] = self.validate_workers(workers) @property def out_group(self) -> SimPEGGroup: @@ -280,11 +280,13 @@ def __init__( self._mappings: list[maps.IdentityMap] | None = None self._window = None - def split_list(self, tiles: list[np.ndarray]) -> list[np.ndarray]: + self.tiles: dict[str, list[np.ndarray]] + + def split_list(self, tiles: list[np.ndarray]) -> list[list[np.ndarray]]: """ Number of splits for the data misfit to be distributed evenly among workers. """ - if len(self.workers) == 0: + if not self.workers: return [[tile] for tile in tiles] n_tiles = len(tiles) @@ -309,7 +311,10 @@ def split_list(self, tiles: list[np.ndarray]) -> list[np.ndarray]: flat_tile_list = [] for tile, split in zip(tiles, split_list): - flat_tile_list.append(np.array_split(tile, split)) + flat_tile_list.append( + [sub for sub in np.array_split(tile, split) if len(sub) > 0] + ) + return flat_tile_list @property @@ -317,17 +322,19 @@ def data_misfit(self): """The Simpeg.data_misfit class""" if getattr(self, "_data_misfit", None) is None: with fetch_active_workspace(self.workspace, mode="r+"): + if self.logger and self.params.compute.tile_spatial > 1: + self.logger.write( + f"Setting up {self.params.compute.tile_spatial} tiles . . .\n" + ) # Tile locations - tiles = self.get_tiles() - - if self.logger: - self.logger.write(f"Setting up {len(tiles)} tile(s) . . .\n") + self.tiles = self.get_tiles() self._data_misfit = MisfitFactory( - self.params, self.client, self.simulation, self.workers - ).build( - self.split_list(tiles), - ) + self.params, + self.simulation, + client=self.client, + workers=self.workers, + ).build(self.tiles) return self._data_misfit @@ -338,6 +345,29 @@ def directives(self): self._directives = DirectivesFactory(self) return self._directives + def get_nested_tiles(self) -> list: + """ + Get nested tiles per channel and receiver tiling. + + Returns a flat list of tiles if auto_scale_channels is False, + otherwise returns a nested list [channel][tiles]. + """ + nested_tiles = [] + for channel in self.tiles.values(): + tile_list = [] + for tile in channel: + if self.params.directives.auto_scale_tiles: + tile_list.append(tile) + else: + tile_list += tile + + if self.params.directives.auto_scale_channels: + nested_tiles.append(tile_list) + else: + nested_tiles += tile_list + + return nested_tiles + @property def inverse_problem(self): if getattr(self, "_inverse_problem", None) is None: @@ -769,31 +799,49 @@ def get_regularization(self): return objective_function.ComboObjectiveFunction(objfcts=reg_funcs) - def get_tiles(self): + def get_tiles(self) -> dict[str, list[np.ndarray]]: + """ + Parse the data locations into tiles for distributed processing. + + Adapts differently to the inversion type (1D, 2D or 3D). + + :return: Dictionary with channels as keys and list of tiles as values. + """ n_data = self.inversion_data.mask.sum() indices = np.arange(n_data) - if "2d" in self.params.inversion_type: - return [indices] - + # Split tiles based on inversion type if "1d" in self.params.inversion_type: # Heuristic to avoid too many chunks n_chunks = n_data // self.params.compute.max_chunk_size - if self.params.compute.n_workers: - n_chunks /= self.params.compute.n_workers - n_chunks = int(n_chunks) * self.params.compute.n_workers + if self.workers: + n_chunks /= len(self.workers) + n_chunks = int(n_chunks) * len(self.workers) - n_chunks = np.max([n_chunks, 1]) + n_chunks = np.max([n_chunks, 1, len(self.workers)]) + tiles = [[tile] for tile in np.array_split(indices, n_chunks)] - return np.array_split(indices, n_chunks) + elif "2d" in self.params.inversion_type: + tiles = [[indices]] - return tile_locations( - self.inversion_data.locations, - self.params.compute.tile_spatial, - labels=self.inversion_data.parts, - sorting=self.simulation.survey.sorting, - ) + else: + tiles = tile_locations( + self.inversion_data.locations, + self.params.compute.tile_spatial, + labels=self.inversion_data.parts, + sorting=self.simulation.survey.sorting, + ) + tiles = self.split_list(tiles) + + # Base slice over frequencies + if self.params.inversion_type in ["magnetotellurics", "tipper", "fdem"]: + channels = self.simulation.survey.frequencies + else: + channels = [None] + + # Duplicate tiles for each channel + return {channel: tiles for channel in channels} @classmethod def start(cls, filepath: str | Path | InputFile, **kwargs) -> Self: diff --git a/simpeg_drivers/electromagnetics/frequency_domain/options.py b/simpeg_drivers/electromagnetics/frequency_domain/options.py index 3dc79cb9..33ef308d 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain/options.py +++ b/simpeg_drivers/electromagnetics/frequency_domain/options.py @@ -22,13 +22,14 @@ LargeLoopGroundFEMReceivers, MovingLoopGroundFEMReceivers, ) -from pydantic import field_validator +from pydantic import AliasChoices, BaseModel, ConfigDict, Field, field_validator from simpeg_drivers import assets_path from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, ConductivityModelOptions, + DirectiveOptions, EMDataMixin, ) @@ -125,4 +126,7 @@ class FDEMInversionOptions(BaseFDEMOptions, BaseInversionOptions): z_real_uncertainty: PropertyGroup | None = None z_imag_channel: PropertyGroup | None = None z_imag_uncertainty: PropertyGroup | None = None + models: ConductivityModelOptions + + directives: DirectiveOptions = DirectiveOptions() diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 611413a5..cf1214e9 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -58,6 +58,7 @@ def data_misfit(self): if getattr(self, "_data_misfit", None) is None and self.drivers is not None: objective_functions = [] multipliers = [] + tiles = [] for label, driver in zip("abc", self.drivers, strict=False): if driver.data_misfit is not None: objective_functions += driver.data_misfit.objfcts @@ -65,11 +66,17 @@ def data_misfit(self): for ii, fun in enumerate(driver.data_misfit.objfcts): fun.name = f"Group_{label.upper()}:Tile_{ii}" - multipliers += [ - (getattr(self.params, f"group_{label}_multiplier") or 1.0) - ** 2.0 - ] * len(driver.data_misfit.objfcts) + multipliers += ( + [ + (getattr(self.params, f"group_{label}_multiplier") or 1.0) + ** 2.0 + * driver.directives.update_irls_directive.chifact_target # Adjust for local chi factors + ] + * len(driver.data_misfit.objfcts) + ) + tiles.append(driver.tiles) + self.tiles = tiles if self.client: return dask_objective_function.DistributedComboMisfits( objfcts=objective_functions, @@ -116,6 +123,17 @@ def get_local_actives(self, driver: InversionDriver): ] = False return global_active + def get_nested_tiles(self): + """Get nested tiles from all drivers.""" + all_tiles = [] + for driver in self.drivers: + if self.params.directives.auto_scale_misfits: + all_tiles.append(driver.get_nested_tiles()) + else: + all_tiles += driver.get_nested_tiles() + + return all_tiles + def initialize(self): """Generate sub drivers.""" diff --git a/simpeg_drivers/joint/options.py b/simpeg_drivers/joint/options.py index faa11fce..0bcac3bb 100644 --- a/simpeg_drivers/joint/options.py +++ b/simpeg_drivers/joint/options.py @@ -13,12 +13,11 @@ from geoh5py.data import FloatData from geoh5py.groups import PropertyGroup, SimPEGGroup -from pydantic import ConfigDict +from pydantic import BaseModel, ConfigDict from simpeg_drivers.options import ( CoolingSceduleOptions, CoreOptions, - DirectiveOptions, IRLSOptions, ModelOptions, OptimizationOptions, @@ -51,6 +50,28 @@ class JointModelOptions(ModelOptions): z_norm: float | FloatData | None = None +class DirectiveOptions(BaseModel): + """ + Directive options for inversion. + + :param auto_scale_misfits: Automatically scale misfits of joint inversions. + :param auto_scale_tiles: Automatically scale tiles. + :param auto_scale_channels: Automatically scale channels. + :param beta_search: Beta search. + :param every_iteration_bool: Update the sensitivity weights every iteration. + :param save_sensitivities: Save sensitivities to file. + :param sens_wts_threshold: Threshold for sensitivity weights. + """ + + model_config = ConfigDict( + arbitrary_types_allowed=True, + ) + auto_scale_misfits: bool = True + every_iteration_bool: bool = True + save_sensitivities: bool = False + sens_wts_threshold: float | None = 1e-0 + + class BaseJointOptions(CoreOptions): """ Base Joint Options. @@ -76,7 +97,7 @@ class BaseJointOptions(CoreOptions): group_c_multiplier: float | None = None irls: IRLSOptions = IRLSOptions() - directives: DirectiveOptions = DirectiveOptions(auto_scale_misfits=True) + directives: DirectiveOptions = DirectiveOptions() cooling_schedule: CoolingSceduleOptions = CoolingSceduleOptions() optimization: OptimizationOptions = OptimizationOptions() diff --git a/simpeg_drivers/natural_sources/magnetotellurics/options.py b/simpeg_drivers/natural_sources/magnetotellurics/options.py index c448a02e..ace35be8 100644 --- a/simpeg_drivers/natural_sources/magnetotellurics/options.py +++ b/simpeg_drivers/natural_sources/magnetotellurics/options.py @@ -19,6 +19,7 @@ from geoh5py.objects import MTReceivers from simpeg_drivers import assets_path +from simpeg_drivers.electromagnetics.frequency_domain.options import DirectiveOptions from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, @@ -117,3 +118,5 @@ class MTInversionOptions(EMDataMixin, BaseInversionOptions): zyy_imag_uncertainty: PropertyGroup | None = None models: ConductivityModelOptions + + directives: DirectiveOptions = DirectiveOptions() diff --git a/simpeg_drivers/natural_sources/tipper/options.py b/simpeg_drivers/natural_sources/tipper/options.py index baeba98f..4f55f377 100644 --- a/simpeg_drivers/natural_sources/tipper/options.py +++ b/simpeg_drivers/natural_sources/tipper/options.py @@ -19,6 +19,7 @@ from geoh5py.objects import TipperReceivers from simpeg_drivers import assets_path +from simpeg_drivers.electromagnetics.frequency_domain.options import DirectiveOptions from simpeg_drivers.options import ( BaseForwardOptions, BaseInversionOptions, @@ -83,3 +84,5 @@ class TipperInversionOptions(EMDataMixin, BaseInversionOptions): tyz_imag_channel: PropertyGroup | None = None tyz_imag_uncertainty: PropertyGroup | None = None models: ConductivityModelOptions + + directives: DirectiveOptions = DirectiveOptions() diff --git a/simpeg_drivers/options.py b/simpeg_drivers/options.py index d086a4ea..18fd7900 100644 --- a/simpeg_drivers/options.py +++ b/simpeg_drivers/options.py @@ -225,7 +225,7 @@ def mesh_cannot_be_rotated(cls, value: Octree): @property def workpath(self): - return Path(self.geoh5.h5file).parent + return Path(self.geoh5.h5file).resolve().parent @property def padding_cells(self) -> int: @@ -396,7 +396,8 @@ class DirectiveOptions(BaseModel): """ Directive options for inversion. - :param auto_scale_misfits: Automatically scale misfits of sub objectives. + :param auto_scale_tiles: Automatically scale tiles. + :param auto_scale_channels: Automatically scale channels. :param beta_search: Beta search. :param every_iteration_bool: Update the sensitivity weights every iteration. :param save_sensitivities: Save sensitivities to file. @@ -406,7 +407,10 @@ class DirectiveOptions(BaseModel): model_config = ConfigDict( arbitrary_types_allowed=True, ) - auto_scale_misfits: bool = False + auto_scale_tiles: bool = Field( + False, validation_alias=AliasChoices("auto_scale_misfits", "auto_scale_tiles") + ) + auto_scale_channels: bool = False every_iteration_bool: bool = True save_sensitivities: bool = False sens_wts_threshold: float | None = 1e-0 diff --git a/simpeg_drivers/potential_fields/gravity/uijson.py b/simpeg_drivers/potential_fields/gravity/uijson.py index aaa050d0..201ab814 100644 --- a/simpeg_drivers/potential_fields/gravity/uijson.py +++ b/simpeg_drivers/potential_fields/gravity/uijson.py @@ -122,7 +122,7 @@ class GravityInversionUIJson(SimPEGDriversUIJson): validation_alias=AliasChoices("percentile", "prctile") ) chi_factor: FloatForm - auto_scale_misfits: BoolForm + auto_scale_tiles: BoolForm initial_beta_ratio: FloatForm initial_beta: FloatForm cooling_factor: FloatForm = Field( diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index 7c1e0987..83864e1d 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -179,14 +179,23 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): max_global_iterations=max_iterations, initial_beta_ratio=1e1, percentile=100, - cooling_rate=3, + cooling_rate=1, chi_factor=0.25, + auto_scale_channels=True, + tile_spatial=2, **data_kwargs, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") driver = FDEMInversionDriver(params) driver.run() + # Scaling is done evenly on channels + np.testing.assert_allclose( + driver.data_misfit.multipliers, + [1.0, 1.0, 0.6004, 0.6004, 0.5047, 0.5047], + atol=1e-3, + ) + with geoh5.open() as run_ws: output = get_inversion_output( driver.params.geoh5.h5file, driver.params.out_group.uid diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index ac8e0bb7..95922ac8 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -94,9 +94,9 @@ def test_tiling_ground_tem( with geoh5.open(): tiles = fwr_driver.get_tiles() - assert len(tiles) == 4 + assert len(tiles[None]) == 4 - for tile in tiles: + for tile in tiles[None]: assert len(np.unique(components.survey.tx_id_property.values[tile])) == 1 fwr_driver.run() diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 7875a7d9..d6838476 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -57,7 +57,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 53.29582613045845, "phi_d": 9270, "phi_m": 0.0898} +target_run = {"data_norm": 53.29582613045845, "phi_d": 9210, "phi_m": 0.133} INDUCING_FIELD = (50000.0, 90.0, 0.0) @@ -200,6 +200,9 @@ def test_joint_cross_gradient_inv_run( starting_model=0.0, reference_model=0.0, upper_bound=1.0, + tile_spatial=2, + auto_scale_tiles=True, + chi_factor=0.8, ) drivers.append(GravityInversionDriver(params)) elif suffix == "C": @@ -231,9 +234,10 @@ def test_joint_cross_gradient_inv_run( data_object=survey, starting_model=1e-4, reference_model=0.0, - tile_spatial=1, tmi_channel=data, tmi_uncertainty=1e1, + tile_spatial=2, + auto_scale_tiles=False, ) drivers.append(MVIInversionDriver(params)) @@ -260,8 +264,29 @@ def test_joint_cross_gradient_inv_run( ) driver = JointCrossGradientDriver(joint_params) + + # Check that chi factors set on the sub drivers are preserved forward + np.testing.assert_allclose( + driver.data_misfit.multipliers, [0.8, 0.8, 1.0, 1.0, 1.0], atol=1e-3 + ) + driver.run() + # Mix of scaling on misfits and tiles. + # Expecting that gravity tiles are independently scaled, but MVI tiles take + # the scaling from its total misfit. + np.testing.assert_allclose( + driver.directives.scale_misfits.scalings, + [0.5011, 0.5, 0.5, 0.5, 1.0], + atol=1e-3, + ) + # Check that scaling * chi factor is reflected in data misfit multipliers + np.testing.assert_allclose( + driver.data_misfit.multipliers, + [0.4009, 0.4, 0.5, 0.5, 1.0], + atol=1e-3, + ) + with Workspace(driver.params.geoh5.h5file): output = get_inversion_output( driver.params.geoh5.h5file, driver.params.out_group.uid diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index d0b69a6d..3c155d7e 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -161,6 +161,7 @@ def test_joint_surveys_inv_run( gz_channel=gz, gz_uncertainty=np.var(gz.values) * 2.0, starting_model=0.0, + tile_spatial=2, ) drivers.append(GravityInversionDriver(params)) @@ -182,11 +183,19 @@ def test_joint_surveys_inv_run( max_global_iterations=max_iterations, initial_beta_ratio=1e-2, percentile=100, + auto_scale_misfits=True, ) driver = JointSurveyDriver(joint_params) driver.run() + # The rescaling is done evenly on the two tiles for both surveys + np.testing.assert_allclose( + driver.data_misfit.multipliers, + [1.0, 1.0, 0.8341, 0.8341], + atol=1e-3, + ) + with Workspace(driver.params.geoh5.h5file): output = get_inversion_output( driver.params.geoh5.h5file, driver.params.out_group.uid