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 f83ba467..c1613147 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: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b +# input_hash: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104 channels: - conda-forge @@ -47,10 +47,10 @@ 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.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 @@ -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 5cefec30..a4dda77b 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: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b +# input_hash: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104 channels: - conda-forge @@ -28,7 +28,7 @@ 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 @@ -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 d568624a..e9b510c3 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: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b +# input_hash: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d channels: - conda-forge @@ -45,10 +45,10 @@ 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.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 @@ -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 1f520a58..2c05c0b5 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: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b +# input_hash: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d channels: - conda-forge @@ -25,7 +25,7 @@ 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 @@ -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 b4dcb72f..3c1435c9 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: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 +# input_hash: 1471200d59eb20e8684a4a95bc16cf082b72549423886d5ea8930f198df963fe channels: - conda-forge @@ -47,11 +47,11 @@ 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 - - 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 @@ -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 336410a8..778a0a4f 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: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 +# input_hash: 1471200d59eb20e8684a4a95bc16cf082b72549423886d5ea8930f198df963fe channels: - conda-forge @@ -29,7 +29,7 @@ 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 @@ -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 6f0c1aa8..fb49c89f 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: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 +# input_hash: 53f066e08b993746d861244be039bf23cd93075c2389e2245dbe627def8c59b2 channels: - conda-forge @@ -45,11 +45,11 @@ 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 - - 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 @@ -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 47d5453b..8987aba1 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: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 +# input_hash: 53f066e08b993746d861244be039bf23cd93075c2389e2245dbe627def8c59b2 channels: - conda-forge @@ -26,7 +26,7 @@ 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 @@ -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 3f101ab6..60f8c999 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: 0d852099be807f95bca241635e52da6569ebdf2d04351127e00b6b7aa7eb7c7b - linux-64: 17857417d27d428057789120a0f069eb7b327a7011fd37401afcd9e52eb22c4b + win-64: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d + linux-64: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104 channels: - url: conda-forge used_env_vars: [] @@ -1147,27 +1147,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,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 @@ -3458,12 +3459,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 @@ -3472,10 +3473,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 @@ -3484,10 +3485,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 @@ -3495,11 +3496,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 @@ -3821,11 +3823,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 @@ -3834,10 +3837,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 @@ -6436,12 +6439,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 @@ -8490,10 +8493,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 @@ -8505,10 +8508,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 @@ -8580,11 +8583,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' @@ -8594,20 +8597,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' @@ -8617,12 +8620,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 @@ -8630,17 +8633,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 @@ -8648,17 +8651,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 diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 1607aef5..6df32ac2 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: c6d99c4080206a6985500566195081cbee7ef83f67dcba0b13ab0757aa9bfb77 - linux-64: ccffba8d0ae8e720a8b58ff10c500924e5464136654551f2d25b30d05d85c2a2 + win-64: 53f066e08b993746d861244be039bf23cd93075c2389e2245dbe627def8c59b2 + linux-64: 1471200d59eb20e8684a4a95bc16cf082b72549423886d5ea8930f198df963fe channels: - url: conda-forge used_env_vars: [] @@ -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 @@ -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 @@ -3509,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 @@ -3523,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 @@ -3535,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 @@ -3546,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 @@ -3872,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 @@ -3885,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 @@ -6491,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 @@ -8576,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 @@ -8591,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 @@ -8666,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' @@ -8680,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' @@ -8703,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 @@ -8716,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 @@ -8734,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 diff --git a/pyproject.toml b/pyproject.toml index 05897dfd..20b54b12 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 scipy = "~1.14.0" @@ -174,7 +174,7 @@ exclude_lines = [ "pragma: no cover" ] -fail_under = 90 +fail_under = 88 [tool.coverage.html] skip_empty = true diff --git a/simpeg_drivers/components/meshes.py b/simpeg_drivers/components/meshes.py index a9834068..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_cell_indexes( # pylint: disable=W0212 - 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): diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index 33788924..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_cell_indexes( # 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 045555ad..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_cell_indexes( # 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_cell_indexes( # 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)