From 51bdacb1ed525d510fd0beba915fe7927601da24 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 18 Feb 2025 12:37:50 -0800 Subject: [PATCH 1/8] Update locks --- .../py-3.10-linux-64-dev.conda.lock.yml | 42 +-- environments/py-3.10-linux-64.conda.lock.yml | 32 +- .../py-3.10-win-64-dev.conda.lock.yml | 40 +- environments/py-3.10-win-64.conda.lock.yml | 30 +- .../py-3.11-linux-64-dev.conda.lock.yml | 44 +-- environments/py-3.11-linux-64.conda.lock.yml | 34 +- .../py-3.11-win-64-dev.conda.lock.yml | 42 +-- environments/py-3.11-win-64.conda.lock.yml | 32 +- py-3.10.conda-lock.yml | 333 ++++++++--------- py-3.11.conda-lock.yml | 347 +++++++++--------- pyproject.toml | 2 +- 11 files changed, 494 insertions(+), 484 deletions(-) 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 74956f72..a3f5b747 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f +# input_hash: 97d39a1b81db73c828d7be8c7f252439700f3a065560fe3b9c029c21f32bd779 channels: - conda-forge @@ -33,7 +33,7 @@ dependencies: - ca-certificates=2025.1.31=hbcca054_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py310h8deb56e_0 - charset-normalizer=3.4.1=pyhd8ed1ab_0 - click=8.1.8=pyh707e725_0 @@ -41,7 +41,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py310h3788b33_0 - - coverage=7.6.10=py310h89163eb_0 + - coverage=7.6.12=py310h89163eb_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -50,14 +50,14 @@ dependencies: - decorator=5.1.1=pyhd8ed1ab_1 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - - discretize=0.10.0=py310hcb52e73_1 + - discretize=0.11.2=py310ha2bacc8_1 - distributed=2024.6.2=pyhd8ed1ab_0 - docutils=0.19=py310hff52083_1 - empymod=2.2.2=pyhd8ed1ab_0 - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py310h89163eb_0 + - fonttools=4.56.0=py310h89163eb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.12.1=h267a509_2 - fsspec=2022.11.0=pyhd8ed1ab_0 @@ -103,12 +103,12 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.16.6=pyh80e38bb_0 + - jupytext=1.16.7=pyhbbac1ac_0 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py310h3788b33_0 - krb5=1.21.3=h659f571_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.43=h712a8e2_2 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 @@ -117,12 +117,12 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=20_linux64_mkl - - libcurl=8.11.1=h332b0f4_0 + - libcurl=8.12.1=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libffi=3.4.2=h7f98852_5 + - libffi=3.4.6=h2dba641_0 - libgcc=14.2.0=h77fa898_1 - libgcc-ng=14.2.0=h69a702a_1 - libgfortran=14.2.0=h69a702a_1 @@ -131,7 +131,7 @@ dependencies: - libiconv=1.17=hd590300_2 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - - libllvm15=15.0.7=hb3ce162_4 + - libllvm15=15.0.7=ha7bfdaf_5 - liblzma=5.6.4=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 @@ -163,7 +163,7 @@ dependencies: - mkl=2023.2.0=h84fe81f_50496 - msgpack-python=1.1.0=py310h3788b33_0 - munkres=1.1.4=pyh9f0ad1d_0 - - myst-nb=1.1.2=pyhd8ed1ab_1 + - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 - nbclient=0.10.2=pyhd8ed1ab_0 - nbconvert=7.16.6=hb482800_0 @@ -174,22 +174,22 @@ dependencies: - nest-asyncio=1.6.0=pyhd8ed1ab_1 - notebook=7.3.2=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - - numba=0.61.0=py310h699fe88_0 + - numba=0.61.0=py310h699fe88_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.3=h5fbd93e_0 - - openssl=3.4.0=h7b32b05_1 + - openssl=3.4.1=h7b32b05_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310h5eaa309_1 - - pandoc=3.6.2=ha770c72_0 + - pandoc=3.6.3=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 - pexpect=4.9.0=pyhd8ed1ab_1 - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py310hebfe307_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.6=pyhd8ed1ab_1 - pluggy=1.5.0=pyhd8ed1ab_1 @@ -256,7 +256,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.37=py310ha75aee5_0 + - sqlalchemy=2.0.38=py310ha75aee5_0 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.12.0=h84d6215_4 @@ -298,11 +298,11 @@ dependencies: - zstandard=0.23.0=py310ha39cb0e_1 - zstd=1.5.6=ha6fb4c9_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 9cf3bf8c..d49e002d 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f +# input_hash: 97d39a1b81db73c828d7be8c7f252439700f3a065560fe3b9c029c21f32bd779 channels: - conda-forge @@ -19,7 +19,7 @@ dependencies: - ca-certificates=2025.1.31=hbcca054_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py310h8deb56e_0 - click=8.1.8=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -28,11 +28,11 @@ dependencies: - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha75aee5_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - - discretize=0.10.0=py310hcb52e73_1 + - discretize=0.11.2=py310ha2bacc8_1 - distributed=2024.6.2=pyhd8ed1ab_0 - empymod=2.2.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py310h89163eb_0 + - fonttools=4.56.0=py310h89163eb_0 - freetype=2.12.1=h267a509_2 - fsspec=2022.11.0=pyhd8ed1ab_0 - geoana=0.5.0=py310hcb52e73_4 @@ -48,7 +48,7 @@ dependencies: - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py310h3788b33_0 - krb5=1.21.3=h659f571_0 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.43=h712a8e2_2 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 @@ -57,12 +57,12 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=20_linux64_mkl - - libcurl=8.11.1=h332b0f4_0 + - libcurl=8.12.1=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - - libffi=3.4.2=h7f98852_5 + - libffi=3.4.6=h2dba641_0 - libgcc=14.2.0=h77fa898_1 - libgcc-ng=14.2.0=h69a702a_1 - libgfortran=14.2.0=h69a702a_1 @@ -71,7 +71,7 @@ dependencies: - libiconv=1.17=hd590300_2 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - - libllvm15=15.0.7=hb3ce162_4 + - libllvm15=15.0.7=ha7bfdaf_5 - liblzma=5.6.4=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 @@ -96,16 +96,16 @@ dependencies: - msgpack-python=1.1.0=py310h3788b33_0 - munkres=1.1.4=pyh9f0ad1d_0 - ncurses=6.5=h2d0b736_3 - - numba=0.61.0=py310h699fe88_0 + - numba=0.61.0=py310h699fe88_1 - numcodecs=0.13.1=py310h5eaa309_0 - numpy=1.26.4=py310hb13e2d6_0 - openjpeg=2.5.3=h5fbd93e_0 - - openssl=3.4.0=h7b32b05_1 + - openssl=3.4.1=h7b32b05_0 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310h5eaa309_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310hebfe307_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - psutil=6.1.1=py310ha75aee5_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 @@ -151,11 +151,11 @@ dependencies: - zstandard=0.23.0=py310ha39cb0e_1 - zstd=1.5.6=ha6fb4c9_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 dd765034..802320cf 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d +# input_hash: 9fe48ed99f252e0fc042cba1f380c3309534cea0de60b20449749618801101c5 channels: - conda-forge @@ -30,7 +30,7 @@ dependencies: - ca-certificates=2025.1.31=h56e8100_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py310ha8f682b_0 - charset-normalizer=3.4.1=pyhd8ed1ab_0 - click=8.1.8=pyh7428d3b_0 @@ -38,7 +38,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py310hc19bc0b_0 - - coverage=7.6.10=py310h38315fa_0 + - coverage=7.6.12=py310h38315fa_0 - cpython=3.10.16=py310hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 @@ -48,14 +48,14 @@ dependencies: - decorator=5.1.1=pyhd8ed1ab_1 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - - discretize=0.10.0=py310h4856b71_1 + - discretize=0.11.2=py310h3e8ed56_1 - distributed=2024.6.2=pyhd8ed1ab_0 - docutils=0.19=py310h5588dad_1 - empymod=2.2.2=pyhd8ed1ab_0 - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py310h38315fa_0 + - fonttools=4.56.0=py310h38315fa_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.12.1=hdaf720e_2 - fsspec=2022.11.0=pyhd8ed1ab_0 @@ -102,11 +102,11 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.16.6=pyh80e38bb_0 + - jupytext=1.16.7=pyhbbac1ac_0 - kiwisolver=1.4.7=py310hc19bc0b_0 - krb5=1.21.3=hdf4eb48_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - - lcms2=2.16=h67d730c_0 + - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h63175ca_0 - libaec=1.1.3=h63175ca_0 - libblas=3.9.0=20_win64_mkl @@ -114,10 +114,10 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=20_win64_mkl - - libcurl=8.11.1=h88aaa65_0 + - libcurl=8.12.1=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libffi=3.4.2=h8ffe710_5 + - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - libiconv=1.17=hcfcfb64_2 - libjpeg-turbo=3.0.0=hcfcfb64_1 @@ -152,7 +152,7 @@ dependencies: - msgpack-python=1.1.0=py310hc19bc0b_0 - msys2-conda-epoch=20160418=1 - munkres=1.1.4=pyh9f0ad1d_0 - - myst-nb=1.1.2=pyhd8ed1ab_1 + - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 - nbclient=0.10.2=pyhd8ed1ab_0 - nbconvert=7.16.6=hb482800_0 @@ -162,21 +162,21 @@ dependencies: - nest-asyncio=1.6.0=pyhd8ed1ab_1 - notebook=7.3.2=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - - numba=0.61.0=py310h7793332_0 + - numba=0.61.0=py310h7793332_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.3=h4d64b90_0 - - openssl=3.4.0=ha4e3fda_1 + - openssl=3.4.1=ha4e3fda_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310hb4db72f_1 - - pandoc=3.6.2=h57928b3_0 + - pandoc=3.6.3=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py310h3e38d90_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.6=pyhd8ed1ab_1 - pluggy=1.5.0=pyhd8ed1ab_1 @@ -244,7 +244,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.37=py310ha8f682b_0 + - sqlalchemy=2.0.38=py310ha8f682b_0 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.12.0=hc790b64_4 @@ -292,11 +292,11 @@ dependencies: - zstandard=0.23.0=py310he5e10e1_1 - zstd=1.5.6=h0ea2cb4_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 0682e0ca..bc31141c 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d +# input_hash: 9fe48ed99f252e0fc042cba1f380c3309534cea0de60b20449749618801101c5 channels: - conda-forge @@ -16,7 +16,7 @@ dependencies: - ca-certificates=2025.1.31=h56e8100_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py310ha8f682b_0 - click=8.1.8=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -25,11 +25,11 @@ dependencies: - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - - discretize=0.10.0=py310h4856b71_1 + - discretize=0.11.2=py310h3e8ed56_1 - distributed=2024.6.2=pyhd8ed1ab_0 - empymod=2.2.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py310h38315fa_0 + - fonttools=4.56.0=py310h38315fa_0 - freetype=2.12.1=hdaf720e_2 - fsspec=2022.11.0=pyhd8ed1ab_0 - geoana=0.5.0=py310h4856b71_4 @@ -45,7 +45,7 @@ dependencies: - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py310hc19bc0b_0 - krb5=1.21.3=hdf4eb48_0 - - lcms2=2.16=h67d730c_0 + - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h63175ca_0 - libaec=1.1.3=h63175ca_0 - libblas=3.9.0=20_win64_mkl @@ -53,10 +53,10 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=20_win64_mkl - - libcurl=8.11.1=h88aaa65_0 + - libcurl=8.12.1=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - - libffi=3.4.2=h8ffe710_5 + - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - libiconv=1.17=hcfcfb64_2 - libjpeg-turbo=3.0.0=hcfcfb64_1 @@ -83,16 +83,16 @@ dependencies: - msgpack-python=1.1.0=py310hc19bc0b_0 - msys2-conda-epoch=20160418=1 - munkres=1.1.4=pyh9f0ad1d_0 - - numba=0.61.0=py310h7793332_0 + - numba=0.61.0=py310h7793332_1 - numcodecs=0.13.1=py310hb4db72f_0 - numpy=1.26.4=py310hf667824_0 - openjpeg=2.5.3=h4d64b90_0 - - openssl=3.4.0=ha4e3fda_1 + - openssl=3.4.1=ha4e3fda_0 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py310hb4db72f_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py310h3e38d90_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - psutil=6.1.1=py310ha8f682b_0 - pthread-stubs=0.4=hcd874cb_1001 - pthreads-win32=2.9.1=h2466b09_4 @@ -143,11 +143,11 @@ dependencies: - zstandard=0.23.0=py310he5e10e1_1 - zstd=1.5.6=h0ea2cb4_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 7d59509c..be555353 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 +# input_hash: 0268a2e06480e877138d031361d12e64e78d37d3e606383cf464783e0d31976a channels: - conda-forge @@ -33,7 +33,7 @@ dependencies: - ca-certificates=2025.1.31=hbcca054_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py311hf29c0ef_0 - charset-normalizer=3.4.1=pyhd8ed1ab_0 - click=8.1.8=pyh707e725_0 @@ -41,7 +41,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311hd18a35c_0 - - coverage=7.6.10=py311h2dc5d0c_0 + - coverage=7.6.12=py311h2dc5d0c_0 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -51,14 +51,14 @@ dependencies: - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - - discretize=0.10.0=py311h92ebd52_1 + - discretize=0.11.2=py311h5b7b71f_1 - distributed=2024.6.2=pyhd8ed1ab_0 - docutils=0.19=py311h38be061_1 - empymod=2.2.2=pyhd8ed1ab_0 - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py311h2dc5d0c_0 + - fonttools=4.56.0=py311h2dc5d0c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.12.1=h267a509_2 - fsspec=2022.11.0=pyhd8ed1ab_0 @@ -104,12 +104,12 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.16.6=pyh80e38bb_0 + - jupytext=1.16.7=pyhbbac1ac_0 - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py311hd18a35c_0 - krb5=1.21.3=h659f571_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.43=h712a8e2_2 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 @@ -118,13 +118,13 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=20_linux64_mkl - - libcurl=8.11.1=h332b0f4_0 + - libcurl=8.12.1=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.6.4=h5888daf_0 - - libffi=3.4.2=h7f98852_5 + - libffi=3.4.6=h2dba641_0 - libgcc=14.2.0=h77fa898_1 - libgcc-ng=14.2.0=h69a702a_1 - libgfortran=14.2.0=h69a702a_1 @@ -133,7 +133,7 @@ dependencies: - libiconv=1.17=hd590300_2 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - - libllvm15=15.0.7=hb3ce162_4 + - libllvm15=15.0.7=ha7bfdaf_5 - liblzma=5.6.4=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 @@ -165,7 +165,7 @@ dependencies: - mkl=2023.2.0=h84fe81f_50496 - msgpack-python=1.1.0=py311hd18a35c_0 - munkres=1.1.4=pyh9f0ad1d_0 - - myst-nb=1.1.2=pyhd8ed1ab_1 + - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 - nbclient=0.10.2=pyhd8ed1ab_0 - nbconvert=7.16.6=hb482800_0 @@ -176,22 +176,22 @@ dependencies: - nest-asyncio=1.6.0=pyhd8ed1ab_1 - notebook=7.3.2=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - - numba=0.61.0=py311h4e1c48f_0 - - numcodecs=0.15.0=py311h7db5c69_0 + - numba=0.61.0=py311h4e1c48f_1 + - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.3=h5fbd93e_0 - - openssl=3.4.0=h7b32b05_1 + - openssl=3.4.1=h7b32b05_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311h7db5c69_1 - - pandoc=3.6.2=ha770c72_0 + - pandoc=3.6.3=ha770c72_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 - pexpect=4.9.0=pyhd8ed1ab_1 - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py311h82a398c_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.6=pyhd8ed1ab_1 - pluggy=1.5.0=pyhd8ed1ab_1 @@ -258,7 +258,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.37=py311h9ecbd09_0 + - sqlalchemy=2.0.38=py311h9ecbd09_0 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.12.0=h84d6215_4 @@ -301,11 +301,11 @@ dependencies: - zstandard=0.23.0=py311hbc35293_1 - zstd=1.5.6=ha6fb4c9_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 f5a68e73..65e4a271 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: linux-64 -# input_hash: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 +# input_hash: 0268a2e06480e877138d031361d12e64e78d37d3e606383cf464783e0d31976a channels: - conda-forge @@ -19,7 +19,7 @@ dependencies: - ca-certificates=2025.1.31=hbcca054_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py311hf29c0ef_0 - click=8.1.8=pyh707e725_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -29,11 +29,11 @@ dependencies: - cytoolz=1.0.1=py311h9ecbd09_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - - discretize=0.10.0=py311h92ebd52_1 + - discretize=0.11.2=py311h5b7b71f_1 - distributed=2024.6.2=pyhd8ed1ab_0 - empymod=2.2.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py311h2dc5d0c_0 + - fonttools=4.56.0=py311h2dc5d0c_0 - freetype=2.12.1=h267a509_2 - fsspec=2022.11.0=pyhd8ed1ab_0 - geoana=0.5.0=py311h92ebd52_4 @@ -49,7 +49,7 @@ dependencies: - keyutils=1.6.1=h166bdaf_0 - kiwisolver=1.4.7=py311hd18a35c_0 - krb5=1.21.3=h659f571_0 - - lcms2=2.16=hb7c19ff_0 + - lcms2=2.17=h717163a_0 - ld_impl_linux-64=2.43=h712a8e2_2 - lerc=4.0.0=h27087fc_0 - libaec=1.1.3=h59595ed_0 @@ -58,13 +58,13 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=20_linux64_mkl - - libcurl=8.11.1=h332b0f4_0 + - libcurl=8.12.1=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libexpat=2.6.4=h5888daf_0 - - libffi=3.4.2=h7f98852_5 + - libffi=3.4.6=h2dba641_0 - libgcc=14.2.0=h77fa898_1 - libgcc-ng=14.2.0=h69a702a_1 - libgfortran=14.2.0=h69a702a_1 @@ -73,7 +73,7 @@ dependencies: - libiconv=1.17=hd590300_2 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=20_linux64_mkl - - libllvm15=15.0.7=hb3ce162_4 + - libllvm15=15.0.7=ha7bfdaf_5 - liblzma=5.6.4=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 @@ -98,16 +98,16 @@ dependencies: - msgpack-python=1.1.0=py311hd18a35c_0 - munkres=1.1.4=pyh9f0ad1d_0 - ncurses=6.5=h2d0b736_3 - - numba=0.61.0=py311h4e1c48f_0 - - numcodecs=0.15.0=py311h7db5c69_0 + - numba=0.61.0=py311h4e1c48f_1 + - numcodecs=0.15.1=py311h7db5c69_0 - numpy=1.26.4=py311h64a7726_0 - openjpeg=2.5.3=h5fbd93e_0 - - openssl=3.4.0=h7b32b05_1 + - openssl=3.4.1=h7b32b05_0 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311h7db5c69_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h82a398c_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - psutil=6.1.1=py311h9ecbd09_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 @@ -154,11 +154,11 @@ dependencies: - zstandard=0.23.0=py311hbc35293_1 - zstd=1.5.6=ha6fb4c9_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 a9425f82..083a30de 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 +# input_hash: 4fa48b4428624987be3ce78b1db27ab43acb2c9047ac8b20e5beaec9c7286777 channels: - conda-forge @@ -30,7 +30,7 @@ dependencies: - ca-certificates=2025.1.31=h56e8100_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py311he736701_0 - charset-normalizer=3.4.1=pyhd8ed1ab_0 - click=8.1.8=pyh7428d3b_0 @@ -38,7 +38,7 @@ dependencies: - colorama=0.4.6=pyhd8ed1ab_1 - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py311h3257749_0 - - coverage=7.6.10=py311h5082efb_0 + - coverage=7.6.12=py311h5082efb_0 - cpython=3.11.11=py311hd8ed1ab_1 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py311he736701_0 @@ -49,14 +49,14 @@ dependencies: - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - - discretize=0.10.0=py311h12feb9d_1 + - discretize=0.11.2=py311h9b10771_0 - distributed=2024.6.2=pyhd8ed1ab_0 - docutils=0.19=py311h1ea47a8_1 - empymod=2.2.2=pyhd8ed1ab_0 - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py311h5082efb_0 + - fonttools=4.56.0=py311h5082efb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.12.1=hdaf720e_2 - fsspec=2022.11.0=pyhd8ed1ab_0 @@ -103,11 +103,11 @@ dependencies: - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 - - jupytext=1.16.6=pyh80e38bb_0 + - jupytext=1.16.7=pyhbbac1ac_0 - kiwisolver=1.4.7=py311h3257749_0 - krb5=1.21.3=hdf4eb48_0 - latexcodec=2.0.1=pyh9f0ad1d_0 - - lcms2=2.16=h67d730c_0 + - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h63175ca_0 - libaec=1.1.3=h63175ca_0 - libblas=3.9.0=20_win64_mkl @@ -115,11 +115,11 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=20_win64_mkl - - libcurl=8.11.1=h88aaa65_0 + - libcurl=8.12.1=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.6.4=he0c23c2_0 - - libffi=3.4.2=h8ffe710_5 + - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - libiconv=1.17=hcfcfb64_2 - libjpeg-turbo=3.0.0=hcfcfb64_1 @@ -154,7 +154,7 @@ dependencies: - msgpack-python=1.1.0=py311h3257749_0 - msys2-conda-epoch=20160418=1 - munkres=1.1.4=pyh9f0ad1d_0 - - myst-nb=1.1.2=pyhd8ed1ab_1 + - myst-nb=1.2.0=pyh29332c3_0 - myst-parser=1.0.0=pyhd8ed1ab_0 - nbclient=0.10.2=pyhd8ed1ab_0 - nbconvert=7.16.6=hb482800_0 @@ -164,21 +164,21 @@ dependencies: - nest-asyncio=1.6.0=pyhd8ed1ab_1 - notebook=7.3.2=pyhd8ed1ab_0 - notebook-shim=0.2.4=pyhd8ed1ab_1 - - numba=0.61.0=py311h0673bce_0 - - numcodecs=0.15.0=py311hcf9f919_0 + - numba=0.61.0=py311h0673bce_1 + - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.3=h4d64b90_0 - - openssl=3.4.0=ha4e3fda_1 + - openssl=3.4.1=ha4e3fda_0 - overrides=7.7.0=pyhd8ed1ab_1 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311hcf9f919_1 - - pandoc=3.6.2=h57928b3_0 + - pandoc=3.6.3=h57928b3_0 - pandocfilters=1.5.0=pyhd8ed1ab_0 - parso=0.8.4=pyhd8ed1ab_1 - partd=1.4.2=pyhd8ed1ab_0 - pickleshare=0.7.5=pyhd8ed1ab_1004 - pillow=10.3.0=py311h5592be9_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - pkgutil-resolve-name=1.3.10=pyhd8ed1ab_2 - platformdirs=4.3.6=pyhd8ed1ab_1 - pluggy=1.5.0=pyhd8ed1ab_1 @@ -246,7 +246,7 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.37=py311he736701_0 + - sqlalchemy=2.0.38=py311he736701_0 - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.12.0=hc790b64_4 @@ -295,11 +295,11 @@ dependencies: - zstandard=0.23.0=py311h53056dc_1 - zstd=1.5.6=h0ea2cb4_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 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 99156cfa..e2a8fef4 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -1,6 +1,6 @@ # Generated by conda-lock. # platform: win-64 -# input_hash: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 +# input_hash: 4fa48b4428624987be3ce78b1db27ab43acb2c9047ac8b20e5beaec9c7286777 channels: - conda-forge @@ -16,7 +16,7 @@ dependencies: - ca-certificates=2025.1.31=h56e8100_0 - cached-property=1.5.2=hd8ed1ab_1 - cached_property=1.5.2=pyha770c72_1 - - certifi=2024.12.14=pyhd8ed1ab_0 + - certifi=2025.1.31=pyhd8ed1ab_0 - cffi=1.17.1=py311he736701_0 - click=8.1.8=pyh7428d3b_0 - cloudpickle=3.1.1=pyhd8ed1ab_0 @@ -26,11 +26,11 @@ dependencies: - cytoolz=1.0.1=py311he736701_0 - dask-core=2024.6.2=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - - discretize=0.10.0=py311h12feb9d_1 + - discretize=0.11.2=py311h9b10771_0 - distributed=2024.6.2=pyhd8ed1ab_0 - empymod=2.2.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.55.8=py311h5082efb_0 + - fonttools=4.56.0=py311h5082efb_0 - freetype=2.12.1=hdaf720e_2 - fsspec=2022.11.0=pyhd8ed1ab_0 - geoana=0.5.0=py311h12feb9d_4 @@ -46,7 +46,7 @@ dependencies: - joblib=1.4.2=pyhd8ed1ab_1 - kiwisolver=1.4.7=py311h3257749_0 - krb5=1.21.3=hdf4eb48_0 - - lcms2=2.16=h67d730c_0 + - lcms2=2.17=hbcf6048_0 - lerc=4.0.0=h63175ca_0 - libaec=1.1.3=h63175ca_0 - libblas=3.9.0=20_win64_mkl @@ -54,11 +54,11 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=20_win64_mkl - - libcurl=8.11.1=h88aaa65_0 + - libcurl=8.12.1=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.6.4=he0c23c2_0 - - libffi=3.4.2=h8ffe710_5 + - libffi=3.4.6=h537db12_0 - libhwloc=2.11.1=default_h8125262_1000 - libiconv=1.17=hcfcfb64_2 - libjpeg-turbo=3.0.0=hcfcfb64_1 @@ -85,16 +85,16 @@ dependencies: - msgpack-python=1.1.0=py311h3257749_0 - msys2-conda-epoch=20160418=1 - munkres=1.1.4=pyh9f0ad1d_0 - - numba=0.61.0=py311h0673bce_0 - - numcodecs=0.15.0=py311hcf9f919_0 + - numba=0.61.0=py311h0673bce_1 + - numcodecs=0.15.1=py311hcf9f919_0 - numpy=1.26.4=py311h0b4df5a_0 - openjpeg=2.5.3=h4d64b90_0 - - openssl=3.4.0=ha4e3fda_1 + - openssl=3.4.1=ha4e3fda_0 - packaging=24.2=pyhd8ed1ab_2 - pandas=2.2.3=py311hcf9f919_1 - partd=1.4.2=pyhd8ed1ab_0 - pillow=10.3.0=py311h5592be9_1 - - pip=25.0=pyh8b19718_0 + - pip=25.0.1=pyh8b19718_0 - psutil=6.1.1=py311he736701_0 - pthread-stubs=0.4=hcd874cb_1001 - pthreads-win32=2.9.1=h2466b09_4 @@ -146,11 +146,11 @@ dependencies: - zstandard=0.23.0=py311h53056dc_1 - zstd=1.5.6=h0ea2cb4_0 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index f6334e38..f1ce8d02 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 545961761a6fd7c3db8ccd2c6af47188a38d76093c7c2ecafb61582fdd424d2d - linux-64: d73ecef65ed7b0f752cc2f320c00b21f7170a26ac3e84514a882fcfe83a9605f + win-64: 9fe48ed99f252e0fc042cba1f380c3309534cea0de60b20449749618801101c5 + linux-64: 97d39a1b81db73c828d7be8c7f252439700f3a065560fe3b9c029c21f32bd779 channels: - url: conda-forge used_env_vars: [] @@ -731,27 +731,27 @@ package: category: main optional: false - name: certifi - version: 2024.12.14 + version: 2025.1.31 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2024.12.14-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2025.1.31-pyhd8ed1ab_0.conda hash: - md5: 6feb87357ecd66733be3279f16a8c400 - sha256: 048c16a9cbcb1fbad02083414d3bc7c1d0eea4b39aee6aa6bf8d1d5089ca8bad + md5: c207fa5ac7ea99b149344385a9c0880d + sha256: 42a78446da06a2568cb13e69be3355169fbd0ea424b00fc80b7d840f5baaacf3 category: main optional: false - name: certifi - version: 2024.12.14 + version: 2025.1.31 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2024.12.14-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2025.1.31-pyhd8ed1ab_0.conda hash: - md5: 6feb87357ecd66733be3279f16a8c400 - sha256: 048c16a9cbcb1fbad02083414d3bc7c1d0eea4b39aee6aa6bf8d1d5089ca8bad + md5: c207fa5ac7ea99b149344385a9c0880d + sha256: 42a78446da06a2568cb13e69be3355169fbd0ea424b00fc80b7d840f5baaacf3 category: main optional: false - name: cffi @@ -948,7 +948,7 @@ package: category: main optional: false - name: coverage - version: 7.6.10 + version: 7.6.12 manager: conda platform: linux-64 dependencies: @@ -957,14 +957,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* tomli: '' - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.10-py310h89163eb_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.12-py310h89163eb_0.conda hash: - md5: f9bf6ea6ddf8349750f1b455f603b0ae - sha256: 41336a050be9faa75b5785af036a756acd95adf2319cf258fe1836e2bf55221b + md5: 6fdad60a1f9adce8c1bf2eca277b3cc8 + sha256: 78cb9ec8b72b52a2846130663a8a54f28a32d3b3560d85eb3bae53e7917c1b94 category: dev optional: true - name: coverage - version: 7.6.10 + version: 7.6.12 manager: conda platform: win-64 dependencies: @@ -974,10 +974,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.10-py310h38315fa_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.12-py310h38315fa_0.conda hash: - md5: 17a5805f88d2bce1e213b73201ef1007 - sha256: 187b0afc6fad0078667b1ade42e02623945c884b70554039cd30c5b92ebf46a6 + md5: ce4c964daa1f98c5158992352531945e + sha256: 880b8bc206618a9e685cbd22be92f0bc9522f35df94d69cd744449a4e45eb53a category: dev optional: true - name: cpython @@ -1219,38 +1219,39 @@ package: category: dev optional: true - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - numpy: '>=1.22.4,<2.0a0' + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + numpy: '>=1.22.4' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.10.0-py310hcb52e73_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.11.2-py310ha2bacc8_1.conda hash: - md5: 1f0f0e9eb694f1d36ea44e167622fd97 - sha256: 3cfbc4e072448f7e1bbcfdff0c01b18ae67d6d83d12b7585567a4dd057b8c02e + md5: d32664b47026c5d23de390d8b46a2701 + sha256: d065d856c25e199a77115a4d8fd54139ee699724a3f1dda6a3f45f33589a66a7 category: main optional: false - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: win-64 dependencies: - numpy: '>=1.22.4,<2.0a0' + numpy: '>=1.22.4' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.10.0-py310h4856b71_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.11.2-py310h3e8ed56_1.conda hash: - md5: 7af88a12920a5b2b5ae459a5dd032019 - sha256: 6170c71a13541cd570afde2d6acfb24f19ced2f3a082c94157ed31d34c92c563 + md5: c9cecabe0352f8d1b7ff7e9d52df7270 + sha256: e9b03398c7bd480b6e9e287fe673bf767694bdb96cc8d95bb9500bcd25766b5e category: main optional: false - name: distributed @@ -1436,7 +1437,7 @@ package: category: main optional: false - name: fonttools - version: 4.55.8 + version: 4.56.0 manager: conda platform: linux-64 dependencies: @@ -1447,14 +1448,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* unicodedata2: '>=15.1.0' - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.55.8-py310h89163eb_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.56.0-py310h89163eb_0.conda hash: - md5: 207d5014bda2e000fab3c1e6f17f1a84 - sha256: a8f42d57da278a713516dfaaf87a8d46e7c36c0408daebe86ad5ffcaa59efc3a + md5: cd3125e1924bd8699dac9989652bca74 + sha256: 751599162ba980477e9267b67d82e116465d0cf69efc52e016e8f72e7f9cdfcd category: main optional: false - name: fonttools - version: 4.55.8 + version: 4.56.0 manager: conda platform: win-64 dependencies: @@ -1466,10 +1467,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.55.8-py310h38315fa_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.56.0-py310h38315fa_0.conda hash: - md5: a750a264b574322892be8a088834bd0d - sha256: 3b447e0cb8702547ea87a13b18ca26683c8d4c5cfd7c2cbdd820370be0d0e9a0 + md5: fd7c0f52022a6bbd9bc7f71c11faf59c + sha256: 2a431938b39c0ba7edf884c5a03ad6ef5f4ce67cb70f34a9bfac5730114f267f category: main optional: false - name: fqdn @@ -2932,7 +2933,7 @@ package: category: dev optional: true - name: jupytext - version: 1.16.6 + version: 1.16.7 manager: conda platform: linux-64 dependencies: @@ -2943,14 +2944,14 @@ package: python: '>=3.9' pyyaml: '' tomli: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.6-pyh80e38bb_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.7-pyhbbac1ac_0.conda hash: - md5: f25972a8da0a44826594059a1bb4d82a - sha256: 8704b9547bf444b737f9ff6b9a8855e7ab0b83f2cee58dd913dfd7600a906b78 + md5: f5abe5ee23914325837250927f20e623 + sha256: cfbd169b6d64c983e74c5fdfbaac1128209017ebd0992f163c13dadea71f606e category: dev optional: true - name: jupytext - version: 1.16.6 + version: 1.16.7 manager: conda platform: win-64 dependencies: @@ -2961,10 +2962,10 @@ package: python: '>=3.9' pyyaml: '' tomli: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.6-pyh80e38bb_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.7-pyhbbac1ac_0.conda hash: - md5: f25972a8da0a44826594059a1bb4d82a - sha256: 8704b9547bf444b737f9ff6b9a8855e7ab0b83f2cee58dd913dfd7600a906b78 + md5: f5abe5ee23914325837250927f20e623 + sha256: cfbd169b6d64c983e74c5fdfbaac1128209017ebd0992f163c13dadea71f606e category: dev optional: true - name: keyutils @@ -3069,33 +3070,34 @@ package: category: dev optional: true - name: lcms2 - version: '2.16' + version: '2.17' manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' libjpeg-turbo: '>=3.0.0,<4.0a0' - libtiff: '>=4.6.0,<4.8.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda + libtiff: '>=4.7.0,<4.8.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.17-h717163a_0.conda hash: - md5: 51bb7010fc86f70eee639b4bb7a894f5 - sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 + md5: 000e85703f0fd9594c81710dd5066471 + sha256: d6a61830a354da022eae93fa896d0991385a875c6bba53c82263a289deda9db8 category: main optional: false - name: lcms2 - version: '2.16' + version: '2.17' manager: conda platform: win-64 dependencies: libjpeg-turbo: '>=3.0.0,<4.0a0' - libtiff: '>=4.6.0,<4.8.0a0' + libtiff: '>=4.7.0,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/lcms2-2.16-h67d730c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/lcms2-2.17-hbcf6048_0.conda hash: - md5: d3592435917b62a8becff3a60db674f6 - sha256: f9fd9e80e46358a57d9bb97b1e37a03da4022143b019aa3c4476d8a7795de290 + md5: 3538827f77b82a837fa681a4579e37a1 + sha256: 7712eab5f1a35ca3ea6db48ead49e0d6ac7f96f8560da8023e61b3dbe4f3b25d category: main optional: false - name: ld_impl_linux-64 @@ -3297,7 +3299,7 @@ package: category: main optional: false - name: libcurl - version: 8.11.1 + version: 8.12.1 manager: conda platform: linux-64 dependencies: @@ -3307,16 +3309,16 @@ package: libnghttp2: '>=1.64.0,<2.0a0' libssh2: '>=1.11.1,<2.0a0' libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' zstd: '>=1.5.6,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.11.1-h332b0f4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.12.1-h332b0f4_0.conda hash: - md5: 2b3e0081006dc21e8bf53a91c83a055c - sha256: 3cd4075b2a7b5562e46c8ec626f6f9ca57aeecaa94ff7df57eca26daa94c9906 + md5: 45e9dc4e7b25e2841deb392be085500e + sha256: 2ebc3039af29269e4cdb858fca36265e5e400c1125a4bcd84ae73a596e0e76ca category: main optional: false - name: libcurl - version: 8.11.1 + version: 8.12.1 manager: conda platform: win-64 dependencies: @@ -3326,10 +3328,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.11.1-h88aaa65_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.12.1-h88aaa65_0.conda hash: - md5: 071d3f18dba5a6a13c6bb70cdb42678f - sha256: 1a67f01da0e35296c6d1fdf6baddc45ad3cc2114132ff4638052eb7cf258aab2 + md5: 2b1c729d91f3b07502981b6e0c7727cc + sha256: 4c8e62fd32d59e5fbfad0f37e33083928bbb3c8800258650d4e7911e6f6fd1aa category: main optional: false - name: libdeflate @@ -3412,28 +3414,30 @@ package: category: main optional: false - name: libffi - version: 3.4.2 + version: 3.4.6 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=9.4.0' - url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.6-h2dba641_0.conda hash: - md5: d645c6d2ac96843a2bfaccd2d62b3ac3 - sha256: ab6e9856c21709b7b517e940ae7028ae0737546122f83c2aa5d692860c3b149e + md5: e3eb7806380bc8bcecba6d749ad5f026 + sha256: 67a6c95e33ebc763c1adc3455b9a9ecde901850eb2fceb8e646cc05ef3a663da category: main optional: false - name: libffi - version: 3.4.2 + version: 3.4.6 manager: conda platform: win-64 dependencies: - vc: '>=14.1,<15.0a0' - vs2015_runtime: '>=14.16.27012' - url: https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.2-h8ffe710_5.tar.bz2 + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.6-h537db12_0.conda hash: - md5: 2c96d1b6915b408893f9472569dee135 - sha256: 1951ab740f80660e9bc07d2ed3aefb874d78c107264fd810f24a1a6211d4b1a5 + md5: 31d5107f75b2f204937728417e2e39e5 + sha256: 77922d8dd2faf88ac6accaeebf06409d1820486fde710cff6b554d12273e46be category: main optional: false - name: libgcc @@ -3597,15 +3601,16 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libxml2: '>=2.12.1,<3.0.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - zstd: '>=1.5.5,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hb3ce162_4.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + libxml2: '>=2.13.5,<3.0a0' + libzlib: '>=1.3.1,<2.0a0' + zstd: '>=1.5.6,<1.6.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-ha7bfdaf_5.conda hash: - md5: 8a35df3cbc0c8b12cc8af9473ae75eef - sha256: e71584c0f910140630580fdd0a013029a52fd31e435192aea2aa8d29005262d1 + md5: f55d1108d59fa85e6a1ded9c70766bd8 + sha256: 7dfa43a79a35debdff93328f9acc3b0ad859929dc7e761160ecbd93275e64e6f category: main optional: false - name: liblzma @@ -4485,7 +4490,7 @@ package: category: main optional: false - name: myst-nb - version: 1.1.2 + version: 1.2.0 manager: conda platform: linux-64 dependencies: @@ -4496,18 +4501,18 @@ package: myst-parser: '>=1.0.0' nbclient: '' nbformat: '>=5.0' - python: '>=3.9' + python: '' pyyaml: '' sphinx: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.1.2-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.2.0-pyh29332c3_0.conda hash: - md5: b78625bb0b4b144fe7048523a178986d - sha256: 0bc2fdde44340d93834983106fdacad5683c441ae5faa5450444e4ff8560f13b + md5: 4f63865e1bb08e05476fa136a2dfe2ac + sha256: de3e58d54126fdb667a55921675693fb8eee23757fd3be6116f6565cae710279 category: dev optional: true - name: myst-nb - version: 1.1.2 + version: 1.2.0 manager: conda platform: win-64 dependencies: @@ -4522,10 +4527,10 @@ package: pyyaml: '' sphinx: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.1.2-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.2.0-pyh29332c3_0.conda hash: - md5: b78625bb0b4b144fe7048523a178986d - sha256: 0bc2fdde44340d93834983106fdacad5683c441ae5faa5450444e4ff8560f13b + md5: 4f63865e1bb08e05476fa136a2dfe2ac + sha256: de3e58d54126fdb667a55921675693fb8eee23757fd3be6116f6565cae710279 category: dev optional: true - name: myst-parser @@ -4848,10 +4853,10 @@ package: numpy: '>=1.24,<2.2' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.61.0-py310h699fe88_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.61.0-py310h699fe88_1.conda hash: - md5: 67c3f8861269c7ad00c0a296ebd091ec - sha256: ef084da75c5b85db326b9173d2d8ea95dd9c2223476da4bc0c6c802198487ca4 + md5: 73bf45d299c017a67dd8fffab92bcaaa + sha256: 2be5e6ad0ffbc0781ab4241bf9ae759e0af6679d4a9e084ed671cef3cacc899d category: main optional: false - name: numba @@ -4866,10 +4871,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/numba-0.61.0-py310h7793332_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/numba-0.61.0-py310h7793332_1.conda hash: - md5: 2b25eefe19afdbec6e6ef9502c91a8af - sha256: 163deb727a45dab26ae1a5eca1da21b8e55f8899e6f7e065aef6790295f2d8f6 + md5: e7f2c80934601fc827391b8fbed20b5c + sha256: 27f54a8453fd36c35467d3b556e0a203774905f37c906158e4fdae3c7edaeb1e category: main optional: false - name: numcodecs @@ -4980,21 +4985,21 @@ package: category: main optional: false - name: openssl - version: 3.4.0 + version: 3.4.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.4.0-h7b32b05_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.4.1-h7b32b05_0.conda hash: - md5: 4ce6875f75469b2757a65e10a5d05e31 - sha256: f62f6bca4a33ca5109b6d571b052a394d836956d21b25b7ffd03376abf7a481f + md5: 41adf927e746dc75ecf0ef841c454e48 + sha256: cbf62df3c79a5c2d113247ddea5658e9ff3697b6e741c210656e239ecaf1768f category: main optional: false - name: openssl - version: 3.4.0 + version: 3.4.1 manager: conda platform: win-64 dependencies: @@ -5002,10 +5007,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/openssl-3.4.0-ha4e3fda_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/openssl-3.4.1-ha4e3fda_0.conda hash: - md5: fb45308ba8bfe1abf1f4a27bad24a743 - sha256: 519a06eaab7c878fbebb8cab98ea4a4465eafb1e9ed8c6ce67226068a80a92f0 + md5: 0730f8094f7088592594f9bf3ae62b3f + sha256: 56dcc2b4430bfc1724e32661c34b71ae33a23a14149866fc5645361cfd3b3a6a category: main optional: false - name: overrides @@ -5099,25 +5104,25 @@ package: category: main optional: false - name: pandoc - version: 3.6.2 + version: 3.6.3 manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.2-ha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.3-ha770c72_0.conda hash: - md5: 4ded4ab71d9fd3764d796a23ca3e722b - sha256: ed347f989622c91dd86180011a93efe284eef5f3d98bec83468165e6b418917e + md5: 16ff7c679250dc09f9732aab14408d2c + sha256: a7392b0d5403676b0b3ab9ff09c1e65d8ab9e1c34349bba9be605d76cf622640 category: dev optional: true - name: pandoc - version: 3.6.2 + version: 3.6.3 manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.2-h57928b3_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.3-h57928b3_0.conda hash: - md5: 05afb57dcba13f72295a1790b95a7996 - sha256: b9b7480ba2339c2e9c48ec66bfce1a93b1fa398bad3404ecc8cbc088b5af2250 + md5: 9b999036cccf0d5a94ed3c0b0edbb905 + sha256: ffdb8fd1da7419f6625c8b2339a12f9669a705ada4177b763cc796c60763f734 category: dev optional: true - name: pandocfilters @@ -5282,31 +5287,31 @@ package: category: main optional: false - name: pip - version: '25.0' + version: 25.0.1 manager: conda platform: linux-64 dependencies: python: '>=3.9,<3.13.0a0' setuptools: '' wheel: '' - url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0-pyh8b19718_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0.1-pyh8b19718_0.conda hash: - md5: c2548760a02ed818f92dd0d8c81b55b4 - sha256: 094fa4c825f8b9e8403e0c0b569c3d50892325acdac1010ff43cc3ac65bf62cd + md5: 79b5c1440aedc5010f687048d9103628 + sha256: 585940f09d87787f79f73ff5dff8eb2af8a67e5bec5eebf2f553cd26c840ba69 category: main optional: false - name: pip - version: '25.0' + version: 25.0.1 manager: conda platform: win-64 dependencies: python: '>=3.9,<3.13.0a0' setuptools: '' wheel: '' - url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0-pyh8b19718_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0.1-pyh8b19718_0.conda hash: - md5: c2548760a02ed818f92dd0d8c81b55b4 - sha256: 094fa4c825f8b9e8403e0c0b569c3d50892325acdac1010ff43cc3ac65bf62cd + md5: 79b5c1440aedc5010f687048d9103628 + sha256: 585940f09d87787f79f73ff5dff8eb2af8a67e5bec5eebf2f553cd26c840ba69 category: main optional: false - name: pkgutil-resolve-name @@ -7233,7 +7238,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.37 + version: 2.0.38 manager: conda platform: linux-64 dependencies: @@ -7243,14 +7248,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.37-py310ha75aee5_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py310ha75aee5_0.conda hash: - md5: c54931e147566053f774738dc5caaa4e - sha256: 22e5d1fea4606b7ba3700f68f733b76d8012ef1b1cc9af85256fd2f0dd3c1fd6 + md5: 11bb9ab95d526337cb9672fe69209b29 + sha256: dda13ac7d41dadc8b5e55dc94772a24543190baebffd5fc228515d55ea1cb48b category: dev optional: true - name: sqlalchemy - version: 2.0.37 + version: 2.0.38 manager: conda platform: win-64 dependencies: @@ -7261,10 +7266,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.37-py310ha8f682b_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py310ha8f682b_0.conda hash: - md5: 73d7dad251d3c87b69f40c72f9bac8e7 - sha256: 510e46d3c619902f4b611ba88441148b13de23e3d591e2b0ae15ea215c1fd33b + md5: 86e42a739127af88d432ab49ae4778c3 + sha256: 84d82e16819e450f3b875461b8430f4433a9f6ab2143e43a018da382913acaf2 category: dev optional: true - name: stack_data @@ -8392,12 +8397,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 hash: - sha256: e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + sha256: 024a5b04bd1d6a71e6f4af590b40c63564f92958 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 category: main optional: false - name: geoapps-utils @@ -8409,12 +8414,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 hash: - sha256: e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + sha256: 024a5b04bd1d6a71e6f4af590b40c63564f92958 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 category: main optional: false - name: geoh5py @@ -8426,12 +8431,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 hash: - sha256: a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + sha256: 99300455d1d5627d8a2e95a7217da2bab4921f48 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 category: main optional: false - name: geoh5py @@ -8443,16 +8448,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 hash: - sha256: a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + sha256: 99300455d1d5627d8a2e95a7217da2bab4921f48 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 category: main optional: false - name: mira-simpeg - version: 0.21.2.2a1.dev98+g382516039 + version: 0.21.2.2.dev104+g7efee14ab manager: pip platform: linux-64 dependencies: @@ -8466,16 +8471,16 @@ package: pymatsolver: '>=0.2,<0.3.0' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e hash: - sha256: 3825160397345dbeaddb9553aa59dab085fbf442 + sha256: 7efee14ab487d289dc91da4fbf8358067078128e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e category: main optional: false - name: mira-simpeg - version: 0.21.2.2a1.dev98+g382516039 + version: 0.21.2.2.dev104+g7efee14ab manager: pip platform: win-64 dependencies: @@ -8489,12 +8494,12 @@ package: pymatsolver: '>=0.2,<0.3.0' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e hash: - sha256: 3825160397345dbeaddb9553aa59dab085fbf442 + sha256: 7efee14ab487d289dc91da4fbf8358067078128e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e category: main optional: false - name: octree-creation-app @@ -8507,12 +8512,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a hash: - sha256: 7d5b68f580b24e1ac096e236d77f739e1465d90f + sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a category: main optional: false - name: octree-creation-app @@ -8525,12 +8530,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a hash: - sha256: 7d5b68f580b24e1ac096e236d77f739e1465d90f + sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a category: main optional: false - name: param-sweeps @@ -8540,12 +8545,12 @@ package: dependencies: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 hash: - sha256: 1d38d71ffd733e0a128db74b3406a6749ea8d4ac + sha256: 39de1da1495aff6d16641d408317619e23adbdb4 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 category: main optional: false - name: param-sweeps @@ -8555,11 +8560,11 @@ package: dependencies: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 hash: - sha256: 1d38d71ffd733e0a128db74b3406a6749ea8d4ac + sha256: 39de1da1495aff6d16641d408317619e23adbdb4 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index cfd08adc..15e64e8f 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -15,8 +15,8 @@ version: 1 metadata: content_hash: - win-64: 4ae98973526361a18247a24da2c9fbe4b2d23567d24479936aa67a1cda88db94 - linux-64: 9763c24f54e81c96312618557d653c8994647978613de9b38a3a921c677567e2 + win-64: 4fa48b4428624987be3ce78b1db27ab43acb2c9047ac8b20e5beaec9c7286777 + linux-64: 0268a2e06480e877138d031361d12e64e78d37d3e606383cf464783e0d31976a channels: - url: conda-forge used_env_vars: [] @@ -729,27 +729,27 @@ package: category: main optional: false - name: certifi - version: 2024.12.14 + version: 2025.1.31 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2024.12.14-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2025.1.31-pyhd8ed1ab_0.conda hash: - md5: 6feb87357ecd66733be3279f16a8c400 - sha256: 048c16a9cbcb1fbad02083414d3bc7c1d0eea4b39aee6aa6bf8d1d5089ca8bad + md5: c207fa5ac7ea99b149344385a9c0880d + sha256: 42a78446da06a2568cb13e69be3355169fbd0ea424b00fc80b7d840f5baaacf3 category: main optional: false - name: certifi - version: 2024.12.14 + version: 2025.1.31 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/certifi-2024.12.14-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/certifi-2025.1.31-pyhd8ed1ab_0.conda hash: - md5: 6feb87357ecd66733be3279f16a8c400 - sha256: 048c16a9cbcb1fbad02083414d3bc7c1d0eea4b39aee6aa6bf8d1d5089ca8bad + md5: c207fa5ac7ea99b149344385a9c0880d + sha256: 42a78446da06a2568cb13e69be3355169fbd0ea424b00fc80b7d840f5baaacf3 category: main optional: false - name: cffi @@ -946,7 +946,7 @@ package: category: main optional: false - name: coverage - version: 7.6.10 + version: 7.6.12 manager: conda platform: linux-64 dependencies: @@ -955,14 +955,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* tomli: '' - url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.10-py311h2dc5d0c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/coverage-7.6.12-py311h2dc5d0c_0.conda hash: - md5: 2a772b30e69ba8319651e9f3ab01608f - sha256: c5782231c9255f0492728bfb74ebcddf2dd8f5561d4f792d9d186d9d360242b8 + md5: c91e6ee1716a1893dfbbf67e6831516e + sha256: 3c9dbaa0ed4c22f312bff5dc54acc21888547a6267af0c136e00c3ae85a9807a category: dev optional: true - name: coverage - version: 7.6.10 + version: 7.6.12 manager: conda platform: win-64 dependencies: @@ -972,10 +972,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.10-py311h5082efb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/coverage-7.6.12-py311h5082efb_0.conda hash: - md5: b985c39f9a9e62e2c16cd71e3832968a - sha256: f634fc561dc5969bf1614c724d5961804fb213100c08a9fad5aa543e51995daf + md5: 514902ab62500c24970e35820b6b6b0a + sha256: 374fbd9d9c8dd4b05dd5292c694ede71fc977e8dc521cb8cd34af30269157886 category: dev optional: true - name: cpython @@ -1243,38 +1243,39 @@ package: category: dev optional: true - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - numpy: '>=1.23.5,<2.0a0' + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + numpy: '>=1.22.4' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* scipy: '>=1.8' - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.10.0-py311h92ebd52_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.11.2-py311h5b7b71f_1.conda hash: - md5: 3d1d8f6df4a2427245c2a445669ed08a - sha256: 0742f151160f7c5a9fbb9edfadd492ae2b3f85c2e4032942c660c87ccf23192f + md5: 46691a03f4c2317ec8c798dc8575bf48 + sha256: 147f8e5403fe7cc0cab3eb8e5cb362347728fe5e485e7c6ca76f5139447b1960 category: main optional: false - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: win-64 dependencies: - numpy: '>=1.23.5,<2.0a0' + numpy: '>=1.22.4' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* scipy: '>=1.8' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.10.0-py311h12feb9d_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.11.2-py311h9b10771_0.conda hash: - md5: ad0c71d1e3af6c3459045205abc165c8 - sha256: 4abbbfabbc30bca363f6ce84bab881df07c95542dd5a82ba4b7c351509d0e66b + md5: 67a5b84650218196cfef1b647c6a9140 + sha256: 0bda0975ae4898c3887be171c9888fd57a20379c129e3149a4708c9d3edf5a2b category: main optional: false - name: distributed @@ -1460,7 +1461,7 @@ package: category: main optional: false - name: fonttools - version: 4.55.8 + version: 4.56.0 manager: conda platform: linux-64 dependencies: @@ -1471,14 +1472,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* unicodedata2: '>=15.1.0' - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.55.8-py311h2dc5d0c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.56.0-py311h2dc5d0c_0.conda hash: - md5: baafc38a3ab0029d7cfbb609b3823ab8 - sha256: 62d7b38802d6812c33987c6797791aa0c72b6aceefab93499b69fa49655b490b + md5: ca3692015a53c7fcc248a324a540c54c + sha256: de9c238166cbff1b06c679395d3e3b0cf1e56969289ccdfb54404ed0a52256c7 category: main optional: false - name: fonttools - version: 4.55.8 + version: 4.56.0 manager: conda platform: win-64 dependencies: @@ -1490,10 +1491,10 @@ package: unicodedata2: '>=15.1.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.55.8-py311h5082efb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.56.0-py311h5082efb_0.conda hash: - md5: a32e32f16500f99010975d7ad30e6a65 - sha256: 1e2741f8329aca8c6ed203272003e469352604dc6b251e5834368581277c76b0 + md5: 0ecd51b246e243291c68c7380e09b274 + sha256: bcfd53b83419d7a891eb77947dc1997c7b4133629988c0797404f76bdf2fe289 category: main optional: false - name: fqdn @@ -2956,7 +2957,7 @@ package: category: dev optional: true - name: jupytext - version: 1.16.6 + version: 1.16.7 manager: conda platform: linux-64 dependencies: @@ -2967,14 +2968,14 @@ package: python: '>=3.9' pyyaml: '' tomli: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.6-pyh80e38bb_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.7-pyhbbac1ac_0.conda hash: - md5: f25972a8da0a44826594059a1bb4d82a - sha256: 8704b9547bf444b737f9ff6b9a8855e7ab0b83f2cee58dd913dfd7600a906b78 + md5: f5abe5ee23914325837250927f20e623 + sha256: cfbd169b6d64c983e74c5fdfbaac1128209017ebd0992f163c13dadea71f606e category: dev optional: true - name: jupytext - version: 1.16.6 + version: 1.16.7 manager: conda platform: win-64 dependencies: @@ -2985,10 +2986,10 @@ package: python: '>=3.9' pyyaml: '' tomli: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.6-pyh80e38bb_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupytext-1.16.7-pyhbbac1ac_0.conda hash: - md5: f25972a8da0a44826594059a1bb4d82a - sha256: 8704b9547bf444b737f9ff6b9a8855e7ab0b83f2cee58dd913dfd7600a906b78 + md5: f5abe5ee23914325837250927f20e623 + sha256: cfbd169b6d64c983e74c5fdfbaac1128209017ebd0992f163c13dadea71f606e category: dev optional: true - name: keyutils @@ -3093,33 +3094,34 @@ package: category: dev optional: true - name: lcms2 - version: '2.16' + version: '2.17' manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' libjpeg-turbo: '>=3.0.0,<4.0a0' - libtiff: '>=4.6.0,<4.8.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.16-hb7c19ff_0.conda + libtiff: '>=4.7.0,<4.8.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/lcms2-2.17-h717163a_0.conda hash: - md5: 51bb7010fc86f70eee639b4bb7a894f5 - sha256: 5c878d104b461b7ef922abe6320711c0d01772f4cd55de18b674f88547870041 + md5: 000e85703f0fd9594c81710dd5066471 + sha256: d6a61830a354da022eae93fa896d0991385a875c6bba53c82263a289deda9db8 category: main optional: false - name: lcms2 - version: '2.16' + version: '2.17' manager: conda platform: win-64 dependencies: libjpeg-turbo: '>=3.0.0,<4.0a0' - libtiff: '>=4.6.0,<4.8.0a0' + libtiff: '>=4.7.0,<4.8.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/lcms2-2.16-h67d730c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/lcms2-2.17-hbcf6048_0.conda hash: - md5: d3592435917b62a8becff3a60db674f6 - sha256: f9fd9e80e46358a57d9bb97b1e37a03da4022143b019aa3c4476d8a7795de290 + md5: 3538827f77b82a837fa681a4579e37a1 + sha256: 7712eab5f1a35ca3ea6db48ead49e0d6ac7f96f8560da8023e61b3dbe4f3b25d category: main optional: false - name: ld_impl_linux-64 @@ -3321,7 +3323,7 @@ package: category: main optional: false - name: libcurl - version: 8.11.1 + version: 8.12.1 manager: conda platform: linux-64 dependencies: @@ -3331,16 +3333,16 @@ package: libnghttp2: '>=1.64.0,<2.0a0' libssh2: '>=1.11.1,<2.0a0' libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' zstd: '>=1.5.6,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.11.1-h332b0f4_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.12.1-h332b0f4_0.conda hash: - md5: 2b3e0081006dc21e8bf53a91c83a055c - sha256: 3cd4075b2a7b5562e46c8ec626f6f9ca57aeecaa94ff7df57eca26daa94c9906 + md5: 45e9dc4e7b25e2841deb392be085500e + sha256: 2ebc3039af29269e4cdb858fca36265e5e400c1125a4bcd84ae73a596e0e76ca category: main optional: false - name: libcurl - version: 8.11.1 + version: 8.12.1 manager: conda platform: win-64 dependencies: @@ -3350,10 +3352,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.11.1-h88aaa65_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.12.1-h88aaa65_0.conda hash: - md5: 071d3f18dba5a6a13c6bb70cdb42678f - sha256: 1a67f01da0e35296c6d1fdf6baddc45ad3cc2114132ff4638052eb7cf258aab2 + md5: 2b1c729d91f3b07502981b6e0c7727cc + sha256: 4c8e62fd32d59e5fbfad0f37e33083928bbb3c8800258650d4e7911e6f6fd1aa category: main optional: false - name: libdeflate @@ -3463,28 +3465,30 @@ package: category: main optional: false - name: libffi - version: 3.4.2 + version: 3.4.6 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=9.4.0' - url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.2-h7f98852_5.tar.bz2 + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + url: https://conda.anaconda.org/conda-forge/linux-64/libffi-3.4.6-h2dba641_0.conda hash: - md5: d645c6d2ac96843a2bfaccd2d62b3ac3 - sha256: ab6e9856c21709b7b517e940ae7028ae0737546122f83c2aa5d692860c3b149e + md5: e3eb7806380bc8bcecba6d749ad5f026 + sha256: 67a6c95e33ebc763c1adc3455b9a9ecde901850eb2fceb8e646cc05ef3a663da category: main optional: false - name: libffi - version: 3.4.2 + version: 3.4.6 manager: conda platform: win-64 dependencies: - vc: '>=14.1,<15.0a0' - vs2015_runtime: '>=14.16.27012' - url: https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.2-h8ffe710_5.tar.bz2 + ucrt: '>=10.0.20348.0' + vc: '>=14.2,<15' + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/libffi-3.4.6-h537db12_0.conda hash: - md5: 2c96d1b6915b408893f9472569dee135 - sha256: 1951ab740f80660e9bc07d2ed3aefb874d78c107264fd810f24a1a6211d4b1a5 + md5: 31d5107f75b2f204937728417e2e39e5 + sha256: 77922d8dd2faf88ac6accaeebf06409d1820486fde710cff6b554d12273e46be category: main optional: false - name: libgcc @@ -3648,15 +3652,16 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libxml2: '>=2.12.1,<3.0.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - zstd: '>=1.5.5,<1.6.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hb3ce162_4.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + libxml2: '>=2.13.5,<3.0a0' + libzlib: '>=1.3.1,<2.0a0' + zstd: '>=1.5.6,<1.6.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-ha7bfdaf_5.conda hash: - md5: 8a35df3cbc0c8b12cc8af9473ae75eef - sha256: e71584c0f910140630580fdd0a013029a52fd31e435192aea2aa8d29005262d1 + md5: f55d1108d59fa85e6a1ded9c70766bd8 + sha256: 7dfa43a79a35debdff93328f9acc3b0ad859929dc7e761160ecbd93275e64e6f category: main optional: false - name: liblzma @@ -4536,7 +4541,7 @@ package: category: main optional: false - name: myst-nb - version: 1.1.2 + version: 1.2.0 manager: conda platform: linux-64 dependencies: @@ -4551,14 +4556,14 @@ package: pyyaml: '' sphinx: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.1.2-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.2.0-pyh29332c3_0.conda hash: - md5: b78625bb0b4b144fe7048523a178986d - sha256: 0bc2fdde44340d93834983106fdacad5683c441ae5faa5450444e4ff8560f13b + md5: 4f63865e1bb08e05476fa136a2dfe2ac + sha256: de3e58d54126fdb667a55921675693fb8eee23757fd3be6116f6565cae710279 category: dev optional: true - name: myst-nb - version: 1.1.2 + version: 1.2.0 manager: conda platform: win-64 dependencies: @@ -4573,10 +4578,10 @@ package: pyyaml: '' sphinx: '>=5' typing_extensions: '' - url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.1.2-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/myst-nb-1.2.0-pyh29332c3_0.conda hash: - md5: b78625bb0b4b144fe7048523a178986d - sha256: 0bc2fdde44340d93834983106fdacad5683c441ae5faa5450444e4ff8560f13b + md5: 4f63865e1bb08e05476fa136a2dfe2ac + sha256: de3e58d54126fdb667a55921675693fb8eee23757fd3be6116f6565cae710279 category: dev optional: true - name: myst-parser @@ -4899,10 +4904,10 @@ package: numpy: '>=1.24,<2.2' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.61.0-py311h4e1c48f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numba-0.61.0-py311h4e1c48f_1.conda hash: - md5: 265b12cabad27acca15c08493973eeb1 - sha256: 23d43f453e05e3c23fbe70a51d6e22c43d8b2f27a5c93612e85cb6565ea5ea49 + md5: 24b37c8a91f275959d158f5f8e3c2439 + sha256: f0f1eae51f0a837a2902bf317819c5381b0cf76bf3abdedf218cef6b1cd6ca26 category: main optional: false - name: numba @@ -4917,14 +4922,14 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/numba-0.61.0-py311h0673bce_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/numba-0.61.0-py311h0673bce_1.conda hash: - md5: 39457b23fbbd36c86cfe40d9f624079d - sha256: 283695efa4d95f1998a58eedd8f7accdaa67c76b46792eaba31a6a10faf83fb3 + md5: c45f583aa699c7c752bdd3cd4658bd4b + sha256: 622717601a63419e190a871cddafb6fd4110a77794099ae69805b726bab6f66c category: main optional: false - name: numcodecs - version: 0.15.0 + version: 0.15.1 manager: conda platform: linux-64 dependencies: @@ -4936,14 +4941,14 @@ package: numpy: '>=1.24' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/numcodecs-0.15.0-py311h7db5c69_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/numcodecs-0.15.1-py311h7db5c69_0.conda hash: - md5: a23ef80377cf798ed3bf2540ffee78f1 - sha256: ad66ccaaa82f68eb5678512f87dd82a87501eaedb0af5b2f240f7de34d08b768 + md5: 969c10aa2c0b994e33a436bea697e214 + sha256: 38794beadfe994f21ae105ec3a888999a002f341a3fb7e8e870fef8212cebfef category: main optional: false - name: numcodecs - version: 0.15.0 + version: 0.15.1 manager: conda platform: win-64 dependencies: @@ -4955,10 +4960,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/numcodecs-0.15.0-py311hcf9f919_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/numcodecs-0.15.1-py311hcf9f919_0.conda hash: - md5: d0c17e3c6bfcce74a492308cd485cb11 - sha256: 5b20c935f10c1dedf59a9690f1ac046ffc736785736acacd896b984f059f0075 + md5: 89d8435b5b12da6eb043309c45b022f2 + sha256: 5c6ece778e8abaed89c5c7529f4fe276fa2ab72013e27301dd08a649e37f1f05 category: main optional: false - name: numpy @@ -5033,21 +5038,21 @@ package: category: main optional: false - name: openssl - version: 3.4.0 + version: 3.4.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' ca-certificates: '' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.4.0-h7b32b05_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/openssl-3.4.1-h7b32b05_0.conda hash: - md5: 4ce6875f75469b2757a65e10a5d05e31 - sha256: f62f6bca4a33ca5109b6d571b052a394d836956d21b25b7ffd03376abf7a481f + md5: 41adf927e746dc75ecf0ef841c454e48 + sha256: cbf62df3c79a5c2d113247ddea5658e9ff3697b6e741c210656e239ecaf1768f category: main optional: false - name: openssl - version: 3.4.0 + version: 3.4.1 manager: conda platform: win-64 dependencies: @@ -5055,10 +5060,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/openssl-3.4.0-ha4e3fda_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/openssl-3.4.1-ha4e3fda_0.conda hash: - md5: fb45308ba8bfe1abf1f4a27bad24a743 - sha256: 519a06eaab7c878fbebb8cab98ea4a4465eafb1e9ed8c6ce67226068a80a92f0 + md5: 0730f8094f7088592594f9bf3ae62b3f + sha256: 56dcc2b4430bfc1724e32661c34b71ae33a23a14149866fc5645361cfd3b3a6a category: main optional: false - name: overrides @@ -5152,25 +5157,25 @@ package: category: main optional: false - name: pandoc - version: 3.6.2 + version: 3.6.3 manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.2-ha770c72_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pandoc-3.6.3-ha770c72_0.conda hash: - md5: 4ded4ab71d9fd3764d796a23ca3e722b - sha256: ed347f989622c91dd86180011a93efe284eef5f3d98bec83468165e6b418917e + md5: 16ff7c679250dc09f9732aab14408d2c + sha256: a7392b0d5403676b0b3ab9ff09c1e65d8ab9e1c34349bba9be605d76cf622640 category: dev optional: true - name: pandoc - version: 3.6.2 + version: 3.6.3 manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.2-h57928b3_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pandoc-3.6.3-h57928b3_0.conda hash: - md5: 05afb57dcba13f72295a1790b95a7996 - sha256: b9b7480ba2339c2e9c48ec66bfce1a93b1fa398bad3404ecc8cbc088b5af2250 + md5: 9b999036cccf0d5a94ed3c0b0edbb905 + sha256: ffdb8fd1da7419f6625c8b2339a12f9669a705ada4177b763cc796c60763f734 category: dev optional: true - name: pandocfilters @@ -5335,31 +5340,31 @@ package: category: main optional: false - name: pip - version: '25.0' + version: 25.0.1 manager: conda platform: linux-64 dependencies: python: '>=3.9,<3.13.0a0' setuptools: '' wheel: '' - url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0-pyh8b19718_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0.1-pyh8b19718_0.conda hash: - md5: c2548760a02ed818f92dd0d8c81b55b4 - sha256: 094fa4c825f8b9e8403e0c0b569c3d50892325acdac1010ff43cc3ac65bf62cd + md5: 79b5c1440aedc5010f687048d9103628 + sha256: 585940f09d87787f79f73ff5dff8eb2af8a67e5bec5eebf2f553cd26c840ba69 category: main optional: false - name: pip - version: '25.0' + version: 25.0.1 manager: conda platform: win-64 dependencies: python: '>=3.9,<3.13.0a0' setuptools: '' wheel: '' - url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0-pyh8b19718_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pip-25.0.1-pyh8b19718_0.conda hash: - md5: c2548760a02ed818f92dd0d8c81b55b4 - sha256: 094fa4c825f8b9e8403e0c0b569c3d50892325acdac1010ff43cc3ac65bf62cd + md5: 79b5c1440aedc5010f687048d9103628 + sha256: 585940f09d87787f79f73ff5dff8eb2af8a67e5bec5eebf2f553cd26c840ba69 category: main optional: false - name: pkgutil-resolve-name @@ -7288,7 +7293,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.37 + version: 2.0.38 manager: conda platform: linux-64 dependencies: @@ -7298,14 +7303,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.37-py311h9ecbd09_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py311h9ecbd09_0.conda hash: - md5: 8bddbf26e97fe68a3e4c20abbd7aaf80 - sha256: 7cdcd4338980fcaf02711827bde1af877db85026521a67521b28536ef8a846fd + md5: abf26162851979957e29e2952b8a62d9 + sha256: ccfbba7080e7ce9d07eee8862c5c81f886b6496f96197cabdeb76e2523f56930 category: dev optional: true - name: sqlalchemy - version: 2.0.37 + version: 2.0.38 manager: conda platform: win-64 dependencies: @@ -7316,10 +7321,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.37-py311he736701_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py311he736701_0.conda hash: - md5: 0a42f9e7e73ff72c3f3e5c9b6caa2222 - sha256: 9003688bfaa0c91279ee40e30a26e1127df9bf067e069fc4506b89dc43b907de + md5: 2376fff5037b991ef237a01b9c048f5a + sha256: 56515b53b4a641fce8364197460fb1b7dfe5c46aa5e3b8d285c7985b714bacb0 category: dev optional: true - name: stack_data @@ -8478,12 +8483,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 hash: - sha256: e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + sha256: 024a5b04bd1d6a71e6f4af590b40c63564f92958 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 category: main optional: false - name: geoapps-utils @@ -8495,12 +8500,12 @@ package: numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 hash: - sha256: e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + sha256: 024a5b04bd1d6a71e6f4af590b40c63564f92958 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@e610b3d8ecaa5ce028b39f09e2902436b11d7af9 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@024a5b04bd1d6a71e6f4af590b40c63564f92958 category: main optional: false - name: geoh5py @@ -8512,12 +8517,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 hash: - sha256: a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + sha256: 99300455d1d5627d8a2e95a7217da2bab4921f48 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 category: main optional: false - name: geoh5py @@ -8529,16 +8534,16 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 hash: - sha256: a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + sha256: 99300455d1d5627d8a2e95a7217da2bab4921f48 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@a90ae78d14429009304cf6d6bac0c40e8b28c4a1 + url: git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 category: main optional: false - name: mira-simpeg - version: 0.21.2.2a1.dev98+g382516039 + version: 0.21.2.2.dev104+g7efee14ab manager: pip platform: linux-64 dependencies: @@ -8552,16 +8557,16 @@ package: pymatsolver: '>=0.2,<0.3.0' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e hash: - sha256: 3825160397345dbeaddb9553aa59dab085fbf442 + sha256: 7efee14ab487d289dc91da4fbf8358067078128e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e category: main optional: false - name: mira-simpeg - version: 0.21.2.2a1.dev98+g382516039 + version: 0.21.2.2.dev104+g7efee14ab manager: pip platform: win-64 dependencies: @@ -8575,12 +8580,12 @@ package: pymatsolver: '>=0.2,<0.3.0' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e hash: - sha256: 3825160397345dbeaddb9553aa59dab085fbf442 + sha256: 7efee14ab487d289dc91da4fbf8358067078128e source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@3825160397345dbeaddb9553aa59dab085fbf442 + url: git+https://github.com/MiraGeoscience/simpeg.git@7efee14ab487d289dc91da4fbf8358067078128e category: main optional: false - name: octree-creation-app @@ -8593,12 +8598,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a hash: - sha256: 7d5b68f580b24e1ac096e236d77f739e1465d90f + sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a category: main optional: false - name: octree-creation-app @@ -8611,12 +8616,12 @@ package: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a hash: - sha256: 7d5b68f580b24e1ac096e236d77f739e1465d90f + sha256: 9d8f676abaef4ad28613fc37d8a9081ece6ae43a source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@7d5b68f580b24e1ac096e236d77f739e1465d90f + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@9d8f676abaef4ad28613fc37d8a9081ece6ae43a category: main optional: false - name: param-sweeps @@ -8626,12 +8631,12 @@ package: dependencies: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 hash: - sha256: 1d38d71ffd733e0a128db74b3406a6749ea8d4ac + sha256: 39de1da1495aff6d16641d408317619e23adbdb4 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 category: main optional: false - name: param-sweeps @@ -8641,11 +8646,11 @@ package: dependencies: geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 hash: - sha256: 1d38d71ffd733e0a128db74b3406a6749ea8d4ac + sha256: 39de1da1495aff6d16641d408317619e23adbdb4 source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@1d38d71ffd733e0a128db74b3406a6749ea8d4ac + url: git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 category: main optional: false diff --git a/pyproject.toml b/pyproject.toml index 847750f3..1f0dbbc0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ include = [ python = "^3.10, <3.12" # geoana does not support 3.12 yet dask = {version = "2024.6.*", extras = ["distributed"]} # also in simpeg[dask] -discretize = "0.10.*" # also in simpeg, octree-creation-app +discretize = "0.11.*" # also in simpeg, octree-creation-app distributed = "2024.6.*" # because conda-lock doesn't take dask extras into account numpy = "~1.26.0" # also in geoh5py, simpeg pydiso = "0.1.*" # not imported, but required at runtime for simpeg From 492ca13ef9cf838c611b9ca511ba4a3843561528 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 18 Feb 2025 12:40:38 -0800 Subject: [PATCH 2/8] Change reference to get_containing_cells --- simpeg_drivers/components/meshes.py | 2 +- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/utils/utils.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index 45ce908e..15218278 100644 --- a/simpeg_drivers/components/meshes.py +++ b/simpeg_drivers/components/meshes.py @@ -231,7 +231,7 @@ def ensure_cell_convention(mesh: Octree) -> TreeMesh | None: attr = f"{dim}_cell_size" setattr(mesh, attr, np.abs(getattr(mesh, attr))) - indices = treemesh._get_containing_cell_indexes( # pylint: disable=W0212 + indices = treemesh.get_containing_cells( # pylint: disable=W0212 mesh.centroids ) ind = np.argsort(indices) diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index bb721fe7..b497884d 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -87,7 +87,7 @@ def drivers(self) -> list[InversionDriver] | None: def get_local_actives(self, driver: InversionDriver): """Get all local active cells within the global mesh for a given driver.""" - in_local = driver.inversion_mesh.mesh._get_containing_cell_indexes( # pylint: disable=W0212 + in_local = driver.inversion_mesh.mesh.get_containing_cells( # pylint: disable=W0212 self.inversion_mesh.mesh.gridCC ) local_actives = driver.inversion_topography.active_cells( diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index f4030897..7faf18f6 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -260,7 +260,7 @@ def drape_to_octree( if method == "nearest": octree_model.append(datum[0].values) else: - lookup_inds = mesh._get_containing_cell_indexes( # pylint: disable=W0212 + lookup_inds = mesh.get_containing_cells( # pylint: disable=W0212 model.centroids ) octree_model[lookup_inds] = datum[0].values @@ -641,7 +641,7 @@ def get_containing_cells( else: locations = data.locations - inds = mesh._get_containing_cell_indexes( # pylint: disable=protected-access + inds = mesh.get_containing_cells( # pylint: disable=protected-access locations ) From b07f590f14072163219a7e79e0a64db82d5c34e2 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 24 Feb 2025 10:20:28 -0800 Subject: [PATCH 3/8] Remove protected access disable --- simpeg_drivers/joint/driver.py | 2 +- simpeg_drivers/utils/utils.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 1947ea22..c6233773 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -87,7 +87,7 @@ def drivers(self) -> list[InversionDriver] | None: def get_local_actives(self, driver: InversionDriver): """Get all local active cells within the global mesh for a given driver.""" - in_local = driver.inversion_mesh.mesh.get_containing_cells( # pylint: disable=W0212 + in_local = driver.inversion_mesh.mesh.get_containing_cells( self.inversion_mesh.mesh.gridCC ) local_actives = driver.inversion_topography.active_cells( diff --git a/simpeg_drivers/utils/utils.py b/simpeg_drivers/utils/utils.py index beaa07bb..c934bf68 100644 --- a/simpeg_drivers/utils/utils.py +++ b/simpeg_drivers/utils/utils.py @@ -259,9 +259,7 @@ def drape_to_octree( if method == "nearest": octree_model.append(datum[0].values) else: - lookup_inds = mesh.get_containing_cells( # pylint: disable=W0212 - model.centroids - ) + lookup_inds = mesh.get_containing_cells(model.centroids) octree_model[lookup_inds] = datum[0].values if method == "nearest": @@ -640,9 +638,7 @@ def get_containing_cells( else: locations = data.locations - inds = mesh.get_containing_cells( # pylint: disable=protected-access - locations - ) + inds = mesh.get_containing_cells(locations) if isinstance(data.entity, LargeLoopGroundEMSurvey): line_ind = [] @@ -828,6 +824,6 @@ def simpeg_group_to_driver(group: SimPEGGroup, workspace: Workspace) -> Inversio inversion_driver = getattr(module, class_name) ifile.set_data_value("out_group", group) - params = inversion_driver._params_class.build(ifile) # pylint: disable=W0212 + params = inversion_driver._params_class.build(ifile) # pylint: disable=protected-access return inversion_driver(params) From 57c97551c1e35e80a6463cb731256ed13daf1d35 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 24 Feb 2025 10:22:26 -0800 Subject: [PATCH 4/8] Change locks --- py-3.10.conda-lock.yml | 169 +++++++++++++++++++++++------------------ 1 file changed, 96 insertions(+), 73 deletions(-) diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 8f7d459a..9c4a9d50 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,13 +15,11 @@ version: 1 metadata: content_hash: - win-64: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d - linux-64: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104 + win-64: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b + linux-64: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b channels: - url: conda-forge used_env_vars: [] - - url: nodefaults - used_env_vars: [] platforms: - win-64 - linux-64 @@ -1147,27 +1145,27 @@ package: category: dev optional: true - name: decorator - version: 5.1.1 + version: 5.2.1 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.2.1-pyhd8ed1ab_0.conda hash: - md5: d622d8d7ee8868870f9cbe259f381181 - sha256: 84e5120c97502a3785e8c3241c3bf51f64b4d445f13b4d2445db00d9816fe479 + md5: 9ce473d1d1be1cc3810856a48b3fab32 + sha256: c17c6b9937c08ad63cb20a26f403a3234088e57d4455600974a0ce865cb14017 category: dev optional: true - name: decorator - version: 5.1.1 + version: 5.2.1 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.2.1-pyhd8ed1ab_0.conda hash: - md5: d622d8d7ee8868870f9cbe259f381181 - sha256: 84e5120c97502a3785e8c3241c3bf51f64b4d445f13b4d2445db00d9816fe479 + md5: 9ce473d1d1be1cc3810856a48b3fab32 + sha256: c17c6b9937c08ad63cb20a26f403a3234088e57d4455600974a0ce865cb14017 category: dev optional: true - name: defusedxml @@ -1219,39 +1217,38 @@ package: category: dev optional: true - name: discretize - version: 0.11.2 + version: 0.10.0 manager: conda platform: linux-64 dependencies: - __glibc: '>=2.17,<3.0.a0' - libgcc: '>=13' - libstdcxx: '>=13' - numpy: '>=1.22.4' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + numpy: '>=1.22.4,<2.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.11.2-py310ha2bacc8_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.10.0-py310hcb52e73_1.conda hash: - md5: d32664b47026c5d23de390d8b46a2701 - sha256: d065d856c25e199a77115a4d8fd54139ee699724a3f1dda6a3f45f33589a66a7 + md5: 1f0f0e9eb694f1d36ea44e167622fd97 + sha256: 3cfbc4e072448f7e1bbcfdff0c01b18ae67d6d83d12b7585567a4dd057b8c02e category: main optional: false - name: discretize - version: 0.11.2 + version: 0.10.0 manager: conda platform: win-64 dependencies: - numpy: '>=1.22.4' + numpy: '>=1.22.4,<2.0a0' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.11.2-py310h3e8ed56_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.10.0-py310h4856b71_1.conda hash: - md5: c9cecabe0352f8d1b7ff7e9d52df7270 - sha256: e9b03398c7bd480b6e9e287fe673bf767694bdb96cc8d95bb9500bcd25766b5e + md5: 7af88a12920a5b2b5ae459a5dd032019 + sha256: 6170c71a13541cd570afde2d6acfb24f19ced2f3a082c94157ed31d34c92c563 category: main optional: false - name: distributed @@ -3459,12 +3456,12 @@ package: manager: conda platform: linux-64 dependencies: - _libgcc_mutex: '0.1' + __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-14.2.0-h77fa898_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-14.2.0-h767d61c_2.conda hash: - md5: 3cb76c3f10d3bc7f1105b2fc9db984df - sha256: 53eb8a79365e58849e7b1a068d31f4f9e718dc938d6f2c03e960345739a03569 + md5: ef504d1acbd74b7cc6849ef8af47dd03 + sha256: 3a572d031cb86deb541d15c1875aaa097baefc0c580b54dc61f5edab99215792 category: main optional: false - name: libgcc-ng @@ -3473,10 +3470,10 @@ package: platform: linux-64 dependencies: libgcc: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.2.0-h69a702a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.2.0-h69a702a_2.conda hash: - md5: e39480b9ca41323497b05492a63bc35b - sha256: 3a76969c80e9af8b6e7a55090088bc41da4cffcde9e2c71b17f44d37b7cb87f7 + md5: a2222a6ada71fb478682efe483ce0f92 + sha256: fb7558c328b38b2f9d2e412c48da7890e7721ba018d733ebdfea57280df01904 category: main optional: false - name: libgfortran @@ -3485,10 +3482,10 @@ package: platform: linux-64 dependencies: libgfortran5: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-14.2.0-h69a702a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-14.2.0-h69a702a_2.conda hash: - md5: f1fd30127802683586f768875127a987 - sha256: fc9e7f22a17faf74da904ebfc4d88699013d2992e55505e4aa0eb01770290977 + md5: fb54c4ea68b460c278d26eea89cfbcc3 + sha256: e05263e8960da03c341650f2a3ffa4ccae4e111cb198e8933a2908125459e5a6 category: main optional: false - name: libgfortran5 @@ -3496,11 +3493,12 @@ package: manager: conda platform: linux-64 dependencies: + __glibc: '>=2.17,<3.0.a0' libgcc: '>=14.2.0' - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-14.2.0-hd5240d6_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-14.2.0-hf1ad2bd_2.conda hash: - md5: 9822b874ea29af082e5d36098d25427d - sha256: d149a37ca73611e425041f33b9d8dbed6e52ec506fe8cc1fc0ee054bddeb6d5d + md5: 556a4fdfac7287d349b8f09aba899693 + sha256: c17b7cf3073a1f4e1f34d50872934fa326346e104d3c445abc1e62481ad6085c category: main optional: false - name: libhwloc @@ -3822,11 +3820,12 @@ package: manager: conda platform: linux-64 dependencies: + __glibc: '>=2.17,<3.0.a0' libgcc: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-14.2.0-hc0a3c3a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-14.2.0-h8f9b012_2.conda hash: - md5: 234a5554c53625688d51062645337328 - sha256: 4661af0eb9bdcbb5fb33e5d0023b001ad4be828fccdcc56500059d56f9869462 + md5: a78c856b6dc6bf4ea8daeb9beaaa3fb0 + sha256: 8f5bd92e4a24e1d35ba015c5252e8f818898478cb3bc50bd8b12ab54707dc4da category: main optional: false - name: libstdcxx-ng @@ -3835,10 +3834,10 @@ package: platform: linux-64 dependencies: libstdcxx: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.2.0-h4852527_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.2.0-h4852527_2.conda hash: - md5: 8371ac6457591af2cf6159439c1fd051 - sha256: 25bb30b827d4f6d6f0522cc0579e431695503822f144043b93c50237017fffd8 + md5: c75da67f045c2627f59e6fcb5f4e3a9b + sha256: e86f38b007cf97cc2c67cd519f2de12a313c4ee3f5ef11652ad08932a5e34189 category: main optional: false - name: libtiff @@ -6437,12 +6436,12 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - ncurses: '>=6.3,<7.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + libgcc: '>=13' + ncurses: '>=6.5,<7.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8c095d6_2.conda hash: - md5: 47d31b792659ce70f470b5c82fdfb7a4 - sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7 + md5: 283b96675859b20a825f8fa30f311446 + sha256: 2d6d0c026902561ed77cd646b5021aef2d4db22e57a5b0178dfc669231e06d2c category: main optional: false - name: readthedocs-sphinx-ext @@ -8491,10 +8490,10 @@ package: libgcc: '>=13' libstdcxx: '>=13' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_1.conda hash: - md5: 3fe5420e4da42d8110c28f21de6cc127 - sha256: b8f7b4c7264e84fcedce3929239f5c55e86ae90948c9fdee666f93a70ca58e66 + md5: 02e4e2fa41a6528afba2e54cbc4280ff + sha256: 532d3623961e34c53aba98db2ad0a33b7a52ff90d6960e505fb2d2efc06bb7da category: main optional: false - name: zstd @@ -8506,10 +8505,34 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_1.conda + hash: + md5: bf190adcc22f146d8ec66da215c9d78b + sha256: a59b096b95f20910158c927797e9144ed9c7970f1b4aca58e6d6c8db9f653006 + category: main + optional: false +- name: discretize + version: 0.11.2 + manager: pip + platform: linux-64 + dependencies: + numpy: '>=1.22.4' + scipy: '>=1.8' + url: https://files.pythonhosted.org/packages/ba/14/7e39708fa4c6803ec352ae39b9a1c33469a3908a2c5a9de0bf75673a7276/discretize-0.11.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + hash: + sha256: 65ed8b386c4631557776dfc1dd51a33ce7ee8ec115ec38817556f5d2997e5200 + category: main + optional: false +- name: discretize + version: 0.11.2 + manager: pip + platform: win-64 + dependencies: + numpy: '>=1.22.4' + scipy: '>=1.8' + url: https://files.pythonhosted.org/packages/8b/62/1fb3bb5153b735906be8d68bf525e28953a57bc3ffcd5bb0fc51db884b36/discretize-0.11.2-cp310-cp310-win_amd64.whl hash: - md5: bac46723604a91de9471a5e72f4f9767 - sha256: 0d162df20a547072234b2716bc7b5f8e8d111f70a2eff29b739761d49c63d135 + sha256: 7fee23239ad3c78e648bf0db4df35e14268aca7540e36e4f6e17bdf2919bd47a category: main optional: false - name: geoapps-utils @@ -8581,11 +8604,11 @@ package: category: main optional: false - name: mira-simpeg - version: 0.21.2.3a1.dev0 + version: 0.21.2.3a1.dev4+g42d85343d manager: pip platform: linux-64 dependencies: - discretize: '>=0.10.0' + discretize: '>=0.11.0' empymod: '>=2.0.0' geoana: '>=0.5.0' geoh5py: '>=0.11.0a1,<0.12.dev' @@ -8595,20 +8618,20 @@ package: pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced hash: - sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 + sha256: 42d85343d46e85faa8fd1f7ac8608a49fe1b4ced source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced category: main optional: false - name: mira-simpeg - version: 0.21.2.3a1.dev0 + version: 0.21.2.3a1.dev4+g42d85343d manager: pip platform: win-64 dependencies: - discretize: '>=0.10.0' + discretize: '>=0.11.0' empymod: '>=2.0.0' geoana: '>=0.5.0' geoh5py: '>=0.11.0a1,<0.12.dev' @@ -8618,12 +8641,12 @@ package: pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced hash: - sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 + sha256: 42d85343d46e85faa8fd1f7ac8608a49fe1b4ced source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced category: main optional: false - name: octree-creation-app @@ -8631,17 +8654,17 @@ package: manager: pip platform: linux-64 dependencies: - discretize: ==0.10.* + discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 hash: - sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 + sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 category: main optional: false - name: octree-creation-app @@ -8649,17 +8672,17 @@ package: manager: pip platform: win-64 dependencies: - discretize: ==0.10.* + discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 hash: - sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 + sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 category: main optional: false - name: param-sweeps From 2448e008419949906b8a27bc1785c0084264c22c Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 24 Feb 2025 11:16:34 -0800 Subject: [PATCH 5/8] Update locks --- .../py-3.10-linux-64-dev.conda.lock.yml | 22 ++-- environments/py-3.10-linux-64.conda.lock.yml | 20 +-- .../py-3.10-win-64-dev.conda.lock.yml | 8 +- environments/py-3.10-win-64.conda.lock.yml | 6 +- .../py-3.11-linux-64-dev.conda.lock.yml | 22 ++-- environments/py-3.11-linux-64.conda.lock.yml | 20 +-- .../py-3.11-win-64-dev.conda.lock.yml | 8 +- environments/py-3.11-win-64.conda.lock.yml | 6 +- py-3.10.conda-lock.yml | 55 +++------ py-3.11.conda-lock.yml | 114 +++++++++--------- 10 files changed, 131 insertions(+), 150 deletions(-) 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 6dcab9f9..c1613147 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -47,7 +47,7 @@ dependencies: - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.12=py310hf71b8c6_0 - - decorator=5.1.1=pyhd8ed1ab_1 + - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - discretize=0.11.2=py310ha2bacc8_1 @@ -124,10 +124,10 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libffi=3.4.6=h2dba641_0 - - libgcc=14.2.0=h77fa898_1 - - libgcc-ng=14.2.0=h69a702a_1 - - libgfortran=14.2.0=h69a702a_1 - - libgfortran5=14.2.0=hd5240d6_1 + - libgcc=14.2.0=h767d61c_2 + - libgcc-ng=14.2.0=h69a702a_2 + - libgfortran=14.2.0=h69a702a_2 + - libgfortran5=14.2.0=hf1ad2bd_2 - libhwloc=2.11.1=default_hecaa2ac_1000 - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 @@ -141,8 +141,8 @@ dependencies: - libsodium=1.0.20=h4ab18f5_0 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - - libstdcxx=14.2.0=hc0a3c3a_1 - - libstdcxx-ng=14.2.0=h4852527_1 + - libstdcxx=14.2.0=h8f9b012_2 + - libstdcxx-ng=14.2.0=h4852527_2 - libtiff=4.7.0=hd9ff511_3 - libuuid=2.38.1=h0b41bf4_0 - libwebp-base=1.5.0=h851e524_0 @@ -228,7 +228,7 @@ dependencies: - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - pyzmq=26.2.1=py310h71f11fc_0 - - readline=8.2=h8228510_1 + - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -301,12 +301,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py310h5764c6d_0 - - zstd=1.5.7=hb8e6e7a_0 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index 8c30af45..a4dda77b 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -64,10 +64,10 @@ dependencies: - libedit=3.1.20250104=pl5321h7949ede_0 - libev=4.33=hd590300_2 - libffi=3.4.6=h2dba641_0 - - libgcc=14.2.0=h77fa898_1 - - libgcc-ng=14.2.0=h69a702a_1 - - libgfortran=14.2.0=h69a702a_1 - - libgfortran5=14.2.0=hd5240d6_1 + - libgcc=14.2.0=h767d61c_2 + - libgcc-ng=14.2.0=h69a702a_2 + - libgfortran=14.2.0=h69a702a_2 + - libgfortran5=14.2.0=hf1ad2bd_2 - libhwloc=2.11.1=default_hecaa2ac_1000 - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 @@ -80,8 +80,8 @@ dependencies: - libscotch=7.0.6=hea33c07_1 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - - libstdcxx=14.2.0=hc0a3c3a_1 - - libstdcxx-ng=14.2.0=h4852527_1 + - libstdcxx=14.2.0=h8f9b012_2 + - libstdcxx-ng=14.2.0=h4852527_2 - libtiff=4.7.0=hd9ff511_3 - libuuid=2.38.1=h0b41bf4_0 - libwebp-base=1.5.0=h851e524_0 @@ -127,7 +127,7 @@ dependencies: - python_abi=3.10=5_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - - readline=8.2=h8228510_1 + - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - setuptools=75.8.0=pyhff2d567_0 @@ -154,12 +154,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py310h5764c6d_0 - - zstd=1.5.7=hb8e6e7a_0 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 bd41298c..e9b510c3 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.12=py310h9e98ed7_0 - - decorator=5.1.1=pyhd8ed1ab_1 + - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 - discretize=0.11.2=py310h3e8ed56_1 @@ -292,12 +292,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py310h8d17308_0 - - zstd=1.5.7=hbeecb71_0 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index a351c549..2c05c0b5 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -143,12 +143,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py310h8d17308_0 - - zstd=1.5.7=hbeecb71_0 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 72e59c2a..3c1435c9 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -47,7 +47,7 @@ dependencies: - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.12=py311hfdbb021_0 - - decorator=5.1.1=pyhd8ed1ab_1 + - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -126,10 +126,10 @@ dependencies: - libev=4.33=hd590300_2 - libexpat=2.6.4=h5888daf_0 - libffi=3.4.6=h2dba641_0 - - libgcc=14.2.0=h77fa898_1 - - libgcc-ng=14.2.0=h69a702a_1 - - libgfortran=14.2.0=h69a702a_1 - - libgfortran5=14.2.0=hd5240d6_1 + - libgcc=14.2.0=h767d61c_2 + - libgcc-ng=14.2.0=h69a702a_2 + - libgfortran=14.2.0=h69a702a_2 + - libgfortran5=14.2.0=hf1ad2bd_2 - libhwloc=2.11.1=default_hecaa2ac_1000 - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 @@ -143,8 +143,8 @@ dependencies: - libsodium=1.0.20=h4ab18f5_0 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - - libstdcxx=14.2.0=hc0a3c3a_1 - - libstdcxx-ng=14.2.0=h4852527_1 + - libstdcxx=14.2.0=h8f9b012_2 + - libstdcxx-ng=14.2.0=h4852527_2 - libtiff=4.7.0=hd9ff511_3 - libuuid=2.38.1=h0b41bf4_0 - libwebp-base=1.5.0=h851e524_0 @@ -230,7 +230,7 @@ dependencies: - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - pyzmq=26.2.1=py311h7deb3e3_0 - - readline=8.2=h8228510_1 + - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -304,12 +304,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py311hd4cff14_0 - - zstd=1.5.7=hb8e6e7a_0 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 51513ee6..778a0a4f 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -66,10 +66,10 @@ dependencies: - libev=4.33=hd590300_2 - libexpat=2.6.4=h5888daf_0 - libffi=3.4.6=h2dba641_0 - - libgcc=14.2.0=h77fa898_1 - - libgcc-ng=14.2.0=h69a702a_1 - - libgfortran=14.2.0=h69a702a_1 - - libgfortran5=14.2.0=hd5240d6_1 + - libgcc=14.2.0=h767d61c_2 + - libgcc-ng=14.2.0=h69a702a_2 + - libgfortran=14.2.0=h69a702a_2 + - libgfortran5=14.2.0=hf1ad2bd_2 - libhwloc=2.11.1=default_hecaa2ac_1000 - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 @@ -82,8 +82,8 @@ dependencies: - libscotch=7.0.6=hea33c07_1 - libsqlite=3.49.1=hee588c1_1 - libssh2=1.11.1=hf672d98_0 - - libstdcxx=14.2.0=hc0a3c3a_1 - - libstdcxx-ng=14.2.0=h4852527_1 + - libstdcxx=14.2.0=h8f9b012_2 + - libstdcxx-ng=14.2.0=h4852527_2 - libtiff=4.7.0=hd9ff511_3 - libuuid=2.38.1=h0b41bf4_0 - libwebp-base=1.5.0=h851e524_0 @@ -129,7 +129,7 @@ dependencies: - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - - readline=8.2=h8228510_1 + - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - setuptools=75.8.0=pyhff2d567_0 @@ -157,12 +157,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py311hd4cff14_0 - - zstd=1.5.7=hb8e6e7a_0 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: 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 312dec93..fb49c89f 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -45,7 +45,7 @@ dependencies: - dask-core=2024.6.2=pyhd8ed1ab_0 - dataclasses=0.8=pyhc8e2a94_3 - debugpy=1.8.12=py311hda3d55a_0 - - decorator=5.1.1=pyhd8ed1ab_1 + - decorator=5.2.1=pyhd8ed1ab_0 - defusedxml=0.7.1=pyhd8ed1ab_0 - deprecated=1.2.18=pyhd8ed1ab_0 - dill=0.3.9=pyhd8ed1ab_1 @@ -295,12 +295,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py311ha68e1ae_0 - - zstd=1.5.7=hbeecb71_0 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index 6030cd2c..8987aba1 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -146,12 +146,12 @@ dependencies: - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - zstandard=0.19.0=py311ha68e1ae_0 - - zstd=1.5.7=hbeecb71_0 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041 - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4 variables: diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index 9c4a9d50..60f8c999 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -15,11 +15,13 @@ version: 1 metadata: content_hash: - win-64: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b - linux-64: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b + win-64: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d + linux-64: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104 channels: - url: conda-forge used_env_vars: [] + - url: nodefaults + used_env_vars: [] platforms: - win-64 - linux-64 @@ -1217,38 +1219,39 @@ package: category: dev optional: true - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - numpy: '>=1.22.4,<2.0a0' + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + numpy: '>=1.22.4' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' - url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.10.0-py310hcb52e73_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/discretize-0.11.2-py310ha2bacc8_1.conda hash: - md5: 1f0f0e9eb694f1d36ea44e167622fd97 - sha256: 3cfbc4e072448f7e1bbcfdff0c01b18ae67d6d83d12b7585567a4dd057b8c02e + md5: d32664b47026c5d23de390d8b46a2701 + sha256: d065d856c25e199a77115a4d8fd54139ee699724a3f1dda6a3f45f33589a66a7 category: main optional: false - name: discretize - version: 0.10.0 + version: 0.11.2 manager: conda platform: win-64 dependencies: - numpy: '>=1.22.4,<2.0a0' + numpy: '>=1.22.4' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* scipy: '>=1.8' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.10.0-py310h4856b71_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/discretize-0.11.2-py310h3e8ed56_1.conda hash: - md5: 7af88a12920a5b2b5ae459a5dd032019 - sha256: 6170c71a13541cd570afde2d6acfb24f19ced2f3a082c94157ed31d34c92c563 + md5: c9cecabe0352f8d1b7ff7e9d52df7270 + sha256: e9b03398c7bd480b6e9e287fe673bf767694bdb96cc8d95bb9500bcd25766b5e category: main optional: false - name: distributed @@ -8511,30 +8514,6 @@ package: sha256: a59b096b95f20910158c927797e9144ed9c7970f1b4aca58e6d6c8db9f653006 category: main optional: false -- name: discretize - version: 0.11.2 - manager: pip - platform: linux-64 - dependencies: - numpy: '>=1.22.4' - scipy: '>=1.8' - url: https://files.pythonhosted.org/packages/ba/14/7e39708fa4c6803ec352ae39b9a1c33469a3908a2c5a9de0bf75673a7276/discretize-0.11.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - hash: - sha256: 65ed8b386c4631557776dfc1dd51a33ce7ee8ec115ec38817556f5d2997e5200 - category: main - optional: false -- name: discretize - version: 0.11.2 - manager: pip - platform: win-64 - dependencies: - numpy: '>=1.22.4' - scipy: '>=1.8' - url: https://files.pythonhosted.org/packages/8b/62/1fb3bb5153b735906be8d68bf525e28953a57bc3ffcd5bb0fc51db884b36/discretize-0.11.2-cp310-cp310-win_amd64.whl - hash: - sha256: 7fee23239ad3c78e648bf0db4df35e14268aca7540e36e4f6e17bdf2919bd47a - category: main - optional: false - name: geoapps-utils version: 0.5.0-alpha.1 manager: pip diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 7a74738f..6df32ac2 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -1145,27 +1145,27 @@ package: category: dev optional: true - name: decorator - version: 5.1.1 + version: 5.2.1 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.2.1-pyhd8ed1ab_0.conda hash: - md5: d622d8d7ee8868870f9cbe259f381181 - sha256: 84e5120c97502a3785e8c3241c3bf51f64b4d445f13b4d2445db00d9816fe479 + md5: 9ce473d1d1be1cc3810856a48b3fab32 + sha256: c17c6b9937c08ad63cb20a26f403a3234088e57d4455600974a0ce865cb14017 category: dev optional: true - name: decorator - version: 5.1.1 + version: 5.2.1 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.1.1-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/decorator-5.2.1-pyhd8ed1ab_0.conda hash: - md5: d622d8d7ee8868870f9cbe259f381181 - sha256: 84e5120c97502a3785e8c3241c3bf51f64b4d445f13b4d2445db00d9816fe479 + md5: 9ce473d1d1be1cc3810856a48b3fab32 + sha256: c17c6b9937c08ad63cb20a26f403a3234088e57d4455600974a0ce865cb14017 category: dev optional: true - name: defusedxml @@ -3510,12 +3510,12 @@ package: manager: conda platform: linux-64 dependencies: - _libgcc_mutex: '0.1' + __glibc: '>=2.17,<3.0.a0' _openmp_mutex: '>=4.5' - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-14.2.0-h77fa898_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-14.2.0-h767d61c_2.conda hash: - md5: 3cb76c3f10d3bc7f1105b2fc9db984df - sha256: 53eb8a79365e58849e7b1a068d31f4f9e718dc938d6f2c03e960345739a03569 + md5: ef504d1acbd74b7cc6849ef8af47dd03 + sha256: 3a572d031cb86deb541d15c1875aaa097baefc0c580b54dc61f5edab99215792 category: main optional: false - name: libgcc-ng @@ -3524,10 +3524,10 @@ package: platform: linux-64 dependencies: libgcc: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.2.0-h69a702a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgcc-ng-14.2.0-h69a702a_2.conda hash: - md5: e39480b9ca41323497b05492a63bc35b - sha256: 3a76969c80e9af8b6e7a55090088bc41da4cffcde9e2c71b17f44d37b7cb87f7 + md5: a2222a6ada71fb478682efe483ce0f92 + sha256: fb7558c328b38b2f9d2e412c48da7890e7721ba018d733ebdfea57280df01904 category: main optional: false - name: libgfortran @@ -3536,10 +3536,10 @@ package: platform: linux-64 dependencies: libgfortran5: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-14.2.0-h69a702a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran-14.2.0-h69a702a_2.conda hash: - md5: f1fd30127802683586f768875127a987 - sha256: fc9e7f22a17faf74da904ebfc4d88699013d2992e55505e4aa0eb01770290977 + md5: fb54c4ea68b460c278d26eea89cfbcc3 + sha256: e05263e8960da03c341650f2a3ffa4ccae4e111cb198e8933a2908125459e5a6 category: main optional: false - name: libgfortran5 @@ -3547,11 +3547,12 @@ package: manager: conda platform: linux-64 dependencies: + __glibc: '>=2.17,<3.0.a0' libgcc: '>=14.2.0' - url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-14.2.0-hd5240d6_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libgfortran5-14.2.0-hf1ad2bd_2.conda hash: - md5: 9822b874ea29af082e5d36098d25427d - sha256: d149a37ca73611e425041f33b9d8dbed6e52ec506fe8cc1fc0ee054bddeb6d5d + md5: 556a4fdfac7287d349b8f09aba899693 + sha256: c17b7cf3073a1f4e1f34d50872934fa326346e104d3c445abc1e62481ad6085c category: main optional: false - name: libhwloc @@ -3873,11 +3874,12 @@ package: manager: conda platform: linux-64 dependencies: + __glibc: '>=2.17,<3.0.a0' libgcc: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-14.2.0-hc0a3c3a_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-14.2.0-h8f9b012_2.conda hash: - md5: 234a5554c53625688d51062645337328 - sha256: 4661af0eb9bdcbb5fb33e5d0023b001ad4be828fccdcc56500059d56f9869462 + md5: a78c856b6dc6bf4ea8daeb9beaaa3fb0 + sha256: 8f5bd92e4a24e1d35ba015c5252e8f818898478cb3bc50bd8b12ab54707dc4da category: main optional: false - name: libstdcxx-ng @@ -3886,10 +3888,10 @@ package: platform: linux-64 dependencies: libstdcxx: 14.2.0 - url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.2.0-h4852527_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libstdcxx-ng-14.2.0-h4852527_2.conda hash: - md5: 8371ac6457591af2cf6159439c1fd051 - sha256: 25bb30b827d4f6d6f0522cc0579e431695503822f144043b93c50237017fffd8 + md5: c75da67f045c2627f59e6fcb5f4e3a9b + sha256: e86f38b007cf97cc2c67cd519f2de12a313c4ee3f5ef11652ad08932a5e34189 category: main optional: false - name: libtiff @@ -6492,12 +6494,12 @@ package: manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - ncurses: '>=6.3,<7.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8228510_1.conda + libgcc: '>=13' + ncurses: '>=6.5,<7.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/readline-8.2-h8c095d6_2.conda hash: - md5: 47d31b792659ce70f470b5c82fdfb7a4 - sha256: 5435cf39d039387fbdc977b0a762357ea909a7694d9528ab40f005e9208744d7 + md5: 283b96675859b20a825f8fa30f311446 + sha256: 2d6d0c026902561ed77cd646b5021aef2d4db22e57a5b0178dfc669231e06d2c category: main optional: false - name: readthedocs-sphinx-ext @@ -8577,10 +8579,10 @@ package: libgcc: '>=13' libstdcxx: '>=13' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_1.conda hash: - md5: 3fe5420e4da42d8110c28f21de6cc127 - sha256: b8f7b4c7264e84fcedce3929239f5c55e86ae90948c9fdee666f93a70ca58e66 + md5: 02e4e2fa41a6528afba2e54cbc4280ff + sha256: 532d3623961e34c53aba98db2ad0a33b7a52ff90d6960e505fb2d2efc06bb7da category: main optional: false - name: zstd @@ -8592,10 +8594,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_1.conda hash: - md5: bac46723604a91de9471a5e72f4f9767 - sha256: 0d162df20a547072234b2716bc7b5f8e8d111f70a2eff29b739761d49c63d135 + md5: bf190adcc22f146d8ec66da215c9d78b + sha256: a59b096b95f20910158c927797e9144ed9c7970f1b4aca58e6d6c8db9f653006 category: main optional: false - name: geoapps-utils @@ -8667,11 +8669,11 @@ package: category: main optional: false - name: mira-simpeg - version: 0.21.2.3a1.dev0 + version: 0.21.2.3a1.dev4+g42d85343d manager: pip platform: linux-64 dependencies: - discretize: '>=0.10.0' + discretize: '>=0.11.0' empymod: '>=2.0.0' geoana: '>=0.5.0' geoh5py: '>=0.11.0a1,<0.12.dev' @@ -8681,20 +8683,20 @@ package: pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced hash: - sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 + sha256: 42d85343d46e85faa8fd1f7ac8608a49fe1b4ced source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced category: main optional: false - name: mira-simpeg - version: 0.21.2.3a1.dev0 + version: 0.21.2.3a1.dev4+g42d85343d manager: pip platform: win-64 dependencies: - discretize: '>=0.10.0' + discretize: '>=0.11.0' empymod: '>=2.0.0' geoana: '>=0.5.0' geoh5py: '>=0.11.0a1,<0.12.dev' @@ -8704,12 +8706,12 @@ package: pymatsolver: '>=0.3,<0.4.dev' scikit-learn: '>=1.2' scipy: '>=1.8.0' - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced hash: - sha256: 77e2a29a990686274b1901c4d2aacb258a5689a0 + sha256: 42d85343d46e85faa8fd1f7ac8608a49fe1b4ced source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@77e2a29a990686274b1901c4d2aacb258a5689a0 + url: git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced category: main optional: false - name: octree-creation-app @@ -8717,17 +8719,17 @@ package: manager: pip platform: linux-64 dependencies: - discretize: ==0.10.* + discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 hash: - sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 + sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 category: main optional: false - name: octree-creation-app @@ -8735,17 +8737,17 @@ package: manager: pip platform: win-64 dependencies: - discretize: ==0.10.* + discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 geoh5py: 0.11.0-alpha.1 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 hash: - sha256: 171c86d5648d4d8636692b97b3a72296b9d3b262 + sha256: 3c479f5d098332ff1c6e0eca0d56be6cc01e0911 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@171c86d5648d4d8636692b97b3a72296b9d3b262 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911 category: main optional: false - name: param-sweeps From d5c6b973b668d9c2d21364e7fa5c24f4cdc5600b Mon Sep 17 00:00:00 2001 From: dominiquef Date: Mon, 24 Feb 2025 11:47:56 -0800 Subject: [PATCH 6/8] Decrease threshold --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 133498e5..20b54b12 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -174,7 +174,7 @@ exclude_lines = [ "pragma: no cover" ] -fail_under = 90 +fail_under = 88 [tool.coverage.html] skip_empty = true From c7216d5c7c528517a2c63824520d07927ca45b50 Mon Sep 17 00:00:00 2001 From: domfournier Date: Mon, 24 Feb 2025 11:50:32 -0800 Subject: [PATCH 7/8] Update simpeg_drivers/components/meshes.py Co-authored-by: benk-mira <81254271+benk-mira@users.noreply.github.com> --- simpeg_drivers/components/meshes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index 0cd683e9..88adef50 100644 --- a/simpeg_drivers/components/meshes.py +++ b/simpeg_drivers/components/meshes.py @@ -227,7 +227,7 @@ def ensure_cell_convention(mesh: Octree) -> TreeMesh | None: attr = f"{dim}_cell_size" setattr(mesh, attr, np.abs(getattr(mesh, attr))) - indices = treemesh.get_containing_cells( # pylint: disable=W0212 + indices = treemesh.get_containing_cells( mesh.centroids ) ind = np.argsort(indices) From 5c98f9a0299a0d1cfa18288f34b933455c139e4e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 19:50:43 +0000 Subject: [PATCH 8/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- simpeg_drivers/components/meshes.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index 88adef50..054b8cad 100644 --- a/simpeg_drivers/components/meshes.py +++ b/simpeg_drivers/components/meshes.py @@ -227,9 +227,7 @@ def ensure_cell_convention(mesh: Octree) -> TreeMesh | None: attr = f"{dim}_cell_size" setattr(mesh, attr, np.abs(getattr(mesh, attr))) - indices = treemesh.get_containing_cells( - mesh.centroids - ) + indices = treemesh.get_containing_cells(mesh.centroids) ind = np.argsort(indices) for child in mesh.children: if child.values is None or isinstance(child.values, np.ndarray):