From b4b124ef2d977522100be2a10957d5ea26d04f5e Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 2 Apr 2025 14:30:41 -0700 Subject: [PATCH 1/6] Add a test for automesh. --- tests/run_tests/driver_mag_automesh_test.py | 62 +++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 tests/run_tests/driver_mag_automesh_test.py diff --git a/tests/run_tests/driver_mag_automesh_test.py b/tests/run_tests/driver_mag_automesh_test.py new file mode 100644 index 00000000..e7992958 --- /dev/null +++ b/tests/run_tests/driver_mag_automesh_test.py @@ -0,0 +1,62 @@ +# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' +# Copyright (c) 2025 Mira Geoscience Ltd. ' +# ' +# This file is part of simpeg-drivers package. ' +# ' +# simpeg-drivers is distributed under the terms and conditions of the MIT License ' +# (see LICENSE file at the root of this source code package). ' +# ' +# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +from __future__ import annotations + +from pathlib import Path + +import numpy as np +from dask.distributed import LocalCluster, performance_report +from geoh5py.workspace import Workspace + +from simpeg_drivers.params import ActiveCellsOptions +from simpeg_drivers.potential_fields import ( + MagneticForwardOptions, + MagneticInversionOptions, +) +from simpeg_drivers.potential_fields.magnetic_scalar.driver import ( + MagneticForwardDriver, + MagneticInversionDriver, +) +from simpeg_drivers.utils.testing import check_target, setup_inversion_workspace +from simpeg_drivers.utils.utils import get_inversion_output + + +def test_automesh( + tmp_path: Path, + n_grid_points=20, + refinement=(4, 8), +): + # Run the forward + geoh5, _, model, survey, topography = setup_inversion_workspace( + tmp_path, + background=0.0, + anomaly=0.05, + refinement=refinement, + n_electrodes=n_grid_points, + n_lines=n_grid_points, + flatten=False, + ) + inducing_field = (49999.8, 90.0, 0.0) + active_cells = ActiveCellsOptions(topography_object=topography) + params = MagneticForwardOptions( + forward_only=True, + geoh5=geoh5, + mesh=None, + active_cells=active_cells, + inducing_field_strength=inducing_field[0], + inducing_field_inclination=inducing_field[1], + inducing_field_declination=inducing_field[2], + data_object=survey, + starting_model=model, + ) + # params.workpath = tmp_path + fwr_driver = MagneticForwardDriver(params) + fwr_driver.run() From 1a0efed724cb7917960b1ddac62f4e8a26688df9 Mon Sep 17 00:00:00 2001 From: benjamink Date: Thu, 3 Apr 2025 13:00:52 -0700 Subject: [PATCH 2/6] provide a None refinement in auto_mesh_parameters to load an empty refinement and match the number of refinements in the default_ui_json (and remove the warning). --- simpeg_drivers/utils/meshes.py | 1 + tests/run_tests/driver_mag_automesh_test.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/simpeg_drivers/utils/meshes.py b/simpeg_drivers/utils/meshes.py index 3f54b77c..77215ec7 100644 --- a/simpeg_drivers/utils/meshes.py +++ b/simpeg_drivers/utils/meshes.py @@ -122,6 +122,7 @@ def auto_mesh_parameters( "levels": topography_refinement, "horizon": True, }, + None, ], "out_group": out_group, } diff --git a/tests/run_tests/driver_mag_automesh_test.py b/tests/run_tests/driver_mag_automesh_test.py index e7992958..9b338753 100644 --- a/tests/run_tests/driver_mag_automesh_test.py +++ b/tests/run_tests/driver_mag_automesh_test.py @@ -57,6 +57,6 @@ def test_automesh( data_object=survey, starting_model=model, ) - # params.workpath = tmp_path + fwr_driver = MagneticForwardDriver(params) fwr_driver.run() From 4d3c41b576df72786368364e79240a72074f4a8b Mon Sep 17 00:00:00 2001 From: benjamink Date: Fri, 4 Apr 2025 09:08:00 -0700 Subject: [PATCH 3/6] Compare data norm to target to track if auto-mesh changes. --- tests/run_tests/driver_mag_automesh_test.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/run_tests/driver_mag_automesh_test.py b/tests/run_tests/driver_mag_automesh_test.py index 9b338753..355b3ded 100644 --- a/tests/run_tests/driver_mag_automesh_test.py +++ b/tests/run_tests/driver_mag_automesh_test.py @@ -29,6 +29,9 @@ from simpeg_drivers.utils.utils import get_inversion_output +TARGET = 1132.1998 + + def test_automesh( tmp_path: Path, n_grid_points=20, @@ -60,3 +63,7 @@ def test_automesh( fwr_driver = MagneticForwardDriver(params) fwr_driver.run() + + with geoh5.open(mode="r"): + data = geoh5.get_entity("Iteration_0_tmi")[0].values + assert np.isclose(np.linalg.norm(data), TARGET) From e59aa9215060d82b6ceaa0b0c022390c9c677727 Mon Sep 17 00:00:00 2001 From: benjamink Date: Fri, 4 Apr 2025 09:25:31 -0700 Subject: [PATCH 4/6] Udate locks --- .../py-3.10-linux-64-dev.conda.lock.yml | 31 +- environments/py-3.10-linux-64.conda.lock.yml | 29 +- .../py-3.10-win-64-dev.conda.lock.yml | 32 +- environments/py-3.10-win-64.conda.lock.yml | 28 +- .../py-3.11-linux-64-dev.conda.lock.yml | 29 +- environments/py-3.11-linux-64.conda.lock.yml | 27 +- .../py-3.11-win-64-dev.conda.lock.yml | 28 +- environments/py-3.11-win-64.conda.lock.yml | 26 +- .../py-3.12-linux-64-dev.conda.lock.yml | 29 +- environments/py-3.12-linux-64.conda.lock.yml | 27 +- .../py-3.12-win-64-dev.conda.lock.yml | 28 +- environments/py-3.12-win-64.conda.lock.yml | 26 +- py-3.10.conda-lock.yml | 290 +++++++++--------- py-3.11.conda-lock.yml | 258 ++++++++-------- py-3.12.conda-lock.yml | 258 ++++++++-------- 15 files changed, 600 insertions(+), 546 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 b1120fa2..6d74c99c 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py310h89163eb_0 + - fonttools=4.57.0=py310h89163eb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -69,6 +69,7 @@ dependencies: - httpcore=1.0.7=pyh29332c3_1 - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - idna=3.10=pyhd8ed1ab_1 - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 @@ -84,7 +85,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py310hff52083_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -115,7 +116,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -129,7 +130,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -144,10 +145,10 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 @@ -201,8 +202,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py310hff52083_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py310hc1293b2_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py310hc1293b2_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py310h69a6472_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -212,7 +213,7 @@ dependencies: - pysocks=1.7.1=pyha55dd90_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.10.16=he725a3c_1_cpython + - python=3.10.16=habfa6aa_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -232,7 +233,7 @@ dependencies: - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - send2trash=1.8.3=pyh0d859eb_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -298,11 +299,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 0f865612..1a7a0b2d 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -30,7 +30,7 @@ dependencies: - discretize=0.11.2=py310ha2bacc8_1 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py310h89163eb_0 + - fonttools=4.57.0=py310h89163eb_0 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 @@ -39,6 +39,7 @@ dependencies: - hdf5=1.14.3=nompi_h2d575fe_109 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 @@ -55,7 +56,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -69,7 +70,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -83,9 +84,9 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h89163eb_1 - matplotlib-base=3.8.4=py310hef631a5_2 @@ -108,13 +109,13 @@ dependencies: - psutil=7.0.0=py310ha75aee5_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py310hc1293b2_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py310hc1293b2_0 - pydiso=0.1.2=py310h69a6472_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 - pysocks=1.7.1=pyha55dd90_7 - - python=3.10.16=he725a3c_1_cpython + - python=3.10.16=habfa6aa_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.2=pyhd8ed1ab_0 @@ -124,7 +125,7 @@ dependencies: - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py310h981052a_1 - scipy=1.14.1=py310hfcf56fc_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 @@ -151,11 +152,11 @@ dependencies: - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 59080e2c..d23c35a0 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -40,7 +40,7 @@ dependencies: - comm=0.2.2=pyhd8ed1ab_1 - contourpy=1.3.1=py310hc19bc0b_0 - coverage=7.8.0=py310h38315fa_0 - - cpython=3.10.16=py310hd8ed1ab_1 + - cpython=3.10.16=py310hd8ed1ab_2 - cycler=0.12.1=pyhd8ed1ab_1 - cytoolz=1.0.1=py310ha8f682b_0 - dask-core=2024.6.2=pyhd8ed1ab_0 @@ -55,7 +55,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py310h38315fa_0 + - fonttools=4.57.0=py310h38315fa_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -85,7 +85,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py310h5588dad_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -114,7 +114,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libffi=3.4.6=h537db12_1 @@ -124,7 +124,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - libsqlite=3.49.1=h67fdade_2 @@ -133,10 +133,10 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 @@ -185,8 +185,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py310h5588dad_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py310h7c79e54_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py310h7c79e54_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py310h8f92c26_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -196,7 +196,7 @@ dependencies: - pysocks=1.7.1=pyh09c184e_7 - pytest=8.3.5=pyhd8ed1ab_0 - pytest-cov=6.0.0=pyhd8ed1ab_1 - - python=3.10.16=h37870fc_1_cpython + - python=3.10.16=hfdde91d_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-fastjsonschema=2.21.1=pyhd8ed1ab_0 - python-json-logger=2.0.7=pyhd8ed1ab_0 @@ -217,7 +217,7 @@ dependencies: - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 - send2trash=1.8.3=pyh5737063_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -289,11 +289,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 9d67542d..2462cd2f 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -29,7 +29,7 @@ dependencies: - discretize=0.11.2=py310h3e8ed56_1 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py310h38315fa_0 + - fonttools=4.57.0=py310h38315fa_0 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 @@ -53,7 +53,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libffi=3.4.6=h537db12_1 @@ -63,7 +63,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 @@ -71,9 +71,9 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py310h38315fa_1 - matplotlib-base=3.8.4=py310hadb10a8_2 @@ -93,13 +93,13 @@ dependencies: - psutil=7.0.0=py310ha8f682b_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py310h7c79e54_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py310h7c79e54_0 - pydiso=0.1.2=py310h8f92c26_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 - pysocks=1.7.1=pyh09c184e_7 - - python=3.10.16=h37870fc_1_cpython + - python=3.10.16=hfdde91d_2_cpython - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 @@ -108,7 +108,7 @@ dependencies: - pyyaml=6.0.2=py310h38315fa_2 - scikit-learn=1.4.2=py310hf2a6c47_1 - scipy=1.14.1=py310hbd0dde3_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 @@ -140,11 +140,11 @@ dependencies: - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 f745b369..467c4ffe 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py311h2dc5d0c_0 + - fonttools=4.57.0=py311h2dc5d0c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -70,6 +70,7 @@ dependencies: - httpcore=1.0.7=pyh29332c3_1 - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - idna=3.10=pyhd8ed1ab_1 - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 @@ -86,7 +87,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py311h38be061_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -117,7 +118,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -132,7 +133,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -147,10 +148,10 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 @@ -204,8 +205,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py311h38be061_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py311h687327b_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py311h687327b_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py311h19ea254_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -235,7 +236,7 @@ dependencies: - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - send2trash=1.8.3=pyh0d859eb_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -302,11 +303,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 49a6b8db..aa30389e 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - discretize=0.11.2=py311h5b7b71f_1 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py311h2dc5d0c_0 + - fonttools=4.57.0=py311h2dc5d0c_0 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 @@ -40,6 +40,7 @@ dependencies: - hdf5=1.14.3=nompi_h2d575fe_109 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 @@ -56,7 +57,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -71,7 +72,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -85,9 +86,9 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h2dc5d0c_1 - matplotlib-base=3.8.4=py311ha4ca890_2 @@ -110,8 +111,8 @@ dependencies: - psutil=7.0.0=py311h9ecbd09_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py311h687327b_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py311h687327b_0 - pydiso=0.1.2=py311h19ea254_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 @@ -126,7 +127,7 @@ dependencies: - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py311he08f58d_1 - scipy=1.14.1=py311he9a78e4_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 @@ -154,11 +155,11 @@ dependencies: - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 4ddd101b..52d5a1cb 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py311h5082efb_0 + - fonttools=4.57.0=py311h5082efb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -87,7 +87,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py311h1ea47a8_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -116,7 +116,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.0=he0c23c2_0 @@ -127,7 +127,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - libsqlite=3.49.1=h67fdade_2 @@ -136,10 +136,10 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 @@ -188,8 +188,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py311h1ea47a8_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py311ha250665_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py311ha250665_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py311h66870c1_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -220,7 +220,7 @@ dependencies: - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 - send2trash=1.8.3=pyh5737063_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -293,11 +293,11 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e 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 710fc320..177d0f2b 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -30,7 +30,7 @@ dependencies: - discretize=0.11.2=py311h9b10771_0 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py311h5082efb_0 + - fonttools=4.57.0=py311h5082efb_0 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 @@ -54,7 +54,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.0=he0c23c2_0 @@ -65,7 +65,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 @@ -73,9 +73,9 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py311h5082efb_1 - matplotlib-base=3.8.4=py311h9b31f6e_2 @@ -95,8 +95,8 @@ dependencies: - psutil=7.0.0=py311he736701_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py311ha250665_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py311ha250665_0 - pydiso=0.1.2=py311h66870c1_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 @@ -110,7 +110,7 @@ dependencies: - pyyaml=6.0.2=py311h5082efb_2 - scikit-learn=1.4.2=py311hdcb8d17_1 - scipy=1.14.1=py311hf16d85f_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 @@ -143,11 +143,11 @@ dependencies: - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64-dev.conda.lock.yml b/environments/py-3.12-linux-64-dev.conda.lock.yml index 6bb6d659..73098278 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py312h178313f_0 + - fonttools=4.57.0=py312h178313f_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -70,6 +70,7 @@ dependencies: - httpcore=1.0.7=pyh29332c3_1 - httpx=0.28.1=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - idna=3.10=pyhd8ed1ab_1 - imagesize=1.4.1=pyhd8ed1ab_0 - importlib-metadata=8.6.1=pyha770c72_0 @@ -86,7 +87,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py312h7900ff3_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -117,7 +118,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -132,7 +133,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -147,10 +148,10 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 @@ -204,8 +205,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py312h7900ff3_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py312h3b7be25_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py312h3b7be25_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py312h772f2df_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -235,7 +236,7 @@ dependencies: - scikit-learn=1.4.2=py312h1fcc3ea_1 - scipy=1.14.1=py312h62794b6_2 - send2trash=1.8.3=pyh0d859eb_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -302,11 +303,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 22469b69..3a032211 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - discretize=0.11.2=py312hc39e661_1 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py312h178313f_0 + - fonttools=4.57.0=py312h178313f_0 - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 @@ -40,6 +40,7 @@ dependencies: - hdf5=1.14.3=nompi_h2d575fe_109 - hpack=4.1.0=pyhd8ed1ab_0 - hyperframe=6.1.0=pyhd8ed1ab_0 + - icu=75.1=he02047a_0 - importlib-metadata=8.6.1=pyha770c72_0 - importlib_metadata=8.6.1=hd8ed1ab_0 - jinja2=3.1.6=pyhd8ed1ab_0 @@ -56,7 +57,7 @@ dependencies: - libbrotlidec=1.1.0=hb9d3cd8_2 - libbrotlienc=1.1.0=hb9d3cd8_2 - libcblas=3.9.0=31_h372d94f_mkl - - libcurl=8.12.1=h332b0f4_0 + - libcurl=8.13.0=h332b0f4_0 - libdeflate=1.23=h4ddbbb0_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libedit=3.1.20250104=pl5321h7949ede_0 @@ -71,7 +72,7 @@ dependencies: - libiconv=1.18=h4ce23a2_1 - libjpeg-turbo=3.0.0=hd590300_1 - liblapack=3.9.0=31_hc41d3b0_mkl - - liblzma=5.6.4=hb9d3cd8_0 + - liblzma=5.8.1=hb9d3cd8_0 - libnghttp2=1.64.0=h161d5f1_0 - libnsl=2.0.1=hd590300_0 - libpng=1.6.47=h943b412_0 @@ -85,9 +86,9 @@ dependencies: - libwebp-base=1.5.0=h851e524_0 - libxcb=1.17.0=h8a09558_0 - libxcrypt=4.4.36=hd590300_1 - - libxml2=2.13.7=h0d44e9d_0 + - libxml2=2.14.0=h8d12d68_0 - libzlib=1.3.1=hb9d3cd8_2 - - llvm-openmp=20.1.1=h024ca30_1 + - llvm-openmp=20.1.2=h024ca30_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h178313f_1 - matplotlib-base=3.8.4=py312h20ab3a6_2 @@ -110,8 +111,8 @@ dependencies: - psutil=7.0.0=py312h66e93f0_0 - pthread-stubs=0.4=hb9d3cd8_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py312h3b7be25_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py312h3b7be25_0 - pydiso=0.1.2=py312h772f2df_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 @@ -126,7 +127,7 @@ dependencies: - readline=8.2=h8c095d6_2 - scikit-learn=1.4.2=py312h1fcc3ea_1 - scipy=1.14.1=py312h62794b6_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 @@ -154,11 +155,11 @@ dependencies: - zstandard=0.23.0=py312h66e93f0_1 - zstd=1.5.7=hb8e6e7a_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64-dev.conda.lock.yml b/environments/py-3.12-win-64-dev.conda.lock.yml index 59ae93a0..cff44531 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -56,7 +56,7 @@ dependencies: - exceptiongroup=1.2.2=pyhd8ed1ab_1 - executing=2.1.0=pyhd8ed1ab_1 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py312h31fea79_0 + - fonttools=4.57.0=py312h31fea79_0 - fqdn=1.5.1=pyhd8ed1ab_1 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 @@ -87,7 +87,7 @@ dependencies: - jedi=0.19.2=pyhd8ed1ab_1 - jinja2=3.1.6=pyhd8ed1ab_0 - joblib=1.4.2=pyhd8ed1ab_1 - - json5=0.10.0=pyhd8ed1ab_1 + - json5=0.12.0=pyhd8ed1ab_0 - jsonpointer=3.0.0=py312h2e8e312_1 - jsonschema=4.23.0=pyhd8ed1ab_1 - jsonschema-specifications=2024.10.1=pyhd8ed1ab_1 @@ -116,7 +116,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.0=he0c23c2_0 @@ -127,7 +127,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsodium=1.0.20=hc70643c_0 - libsqlite=3.49.1=h67fdade_2 @@ -136,10 +136,10 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - linkify-it-py=2.0.3=pyhd8ed1ab_1 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markdown-it-py=2.2.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 @@ -188,8 +188,8 @@ dependencies: - pybtex=0.24.0=pyhd8ed1ab_3 - pybtex-docutils=1.0.3=py312h2e8e312_2 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py312hfe1d9c4_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py312hfe1d9c4_0 - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0 - pydiso=0.1.2=py312h01acb21_0 - pygments=2.19.1=pyhd8ed1ab_0 @@ -220,7 +220,7 @@ dependencies: - scikit-learn=1.4.2=py312h816cc57_1 - scipy=1.14.1=py312h337df96_2 - send2trash=1.8.3=pyh5737063_1 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sniffio=1.3.1=pyhd8ed1ab_1 - snowballstemmer=2.2.0=pyhd8ed1ab_0 @@ -293,11 +293,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e variables: KMP_WARNINGS: 0 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 1ebc636f..3f7e9a27 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -30,7 +30,7 @@ dependencies: - discretize=0.11.2=py312hbaa7e33_1 - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - - fonttools=4.56.0=py312h31fea79_0 + - fonttools=4.57.0=py312h31fea79_0 - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.2=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 @@ -54,7 +54,7 @@ dependencies: - libbrotlidec=1.1.0=h2466b09_2 - libbrotlienc=1.1.0=h2466b09_2 - libcblas=3.9.0=31_h5e41251_mkl - - libcurl=8.12.1=h88aaa65_0 + - libcurl=8.13.0=h88aaa65_0 - libdeflate=1.23=h9062f6e_0 - libdlf=0.3.0=pyhd8ed1ab_1 - libexpat=2.7.0=he0c23c2_0 @@ -65,7 +65,7 @@ dependencies: - libiconv=1.18=h135ad9c_1 - libjpeg-turbo=3.0.0=hcfcfb64_1 - liblapack=3.9.0=31_h1aa476e_mkl - - liblzma=5.6.4=h2466b09_0 + - liblzma=5.8.1=h2466b09_0 - libpng=1.6.47=had7236b_0 - libsqlite=3.49.1=h67fdade_2 - libssh2=1.11.1=he619c9f_0 @@ -73,9 +73,9 @@ dependencies: - libwebp-base=1.5.0=h3b0e114_0 - libwinpthread=12.0.0.r4.gg4f2fc60ca=h57928b3_9 - libxcb=1.17.0=h0e4246c_0 - - libxml2=2.13.7=he286e8c_0 + - libxml2=2.14.0=had0eb51_0 - libzlib=1.3.1=h2466b09_2 - - llvm-openmp=20.1.1=h30eaf37_1 + - llvm-openmp=20.1.2=h30eaf37_0 - locket=1.0.0=pyhd8ed1ab_0 - markupsafe=3.0.2=py312h31fea79_1 - matplotlib-base=3.8.4=py312hfee7060_2 @@ -95,8 +95,8 @@ dependencies: - psutil=7.0.0=py312h4389bb4_0 - pthread-stubs=0.4=h0e40799_1002 - pycparser=2.22=pyh29332c3_1 - - pydantic=2.11.1=pyh3cfb1c2_0 - - pydantic-core=2.33.0=py312hfe1d9c4_0 + - pydantic=2.11.2=pyh3cfb1c2_0 + - pydantic-core=2.33.1=py312hfe1d9c4_0 - pydiso=0.1.2=py312h01acb21_0 - pymatsolver=0.3.1=pyh48887ae_201 - pyparsing=3.2.3=pyhd8ed1ab_1 @@ -110,7 +110,7 @@ dependencies: - pyyaml=6.0.2=py312h31fea79_2 - scikit-learn=1.4.2=py312h816cc57_1 - scipy=1.14.1=py312h337df96_2 - - setuptools=75.8.2=pyhff2d567_0 + - setuptools=78.1.0=pyhff2d567_0 - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 @@ -143,11 +143,11 @@ dependencies: - zstandard=0.23.0=py312h4389bb4_1 - zstd=1.5.7=hbeecb71_2 - pip: - - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c - - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 - - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b + - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 + - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e variables: KMP_WARNINGS: 0 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index f29365aa..f446cee9 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -986,12 +986,12 @@ package: manager: conda platform: win-64 dependencies: - python: 3.10.16.* + python: '>=3.10,<3.11.0a0' python_abi: '*' - url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.10.16-py310hd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/cpython-3.10.16-py310hd8ed1ab_2.conda hash: - md5: 5c7fe189f8761cd08a69924554c1ffab - sha256: 522b5ff2c5b1ebe0050ad15cd76a1e14696752eead790ab28e29977d7a8a99e6 + md5: 731d4f970ff08955a65812ac24fe1cf9 + sha256: 01550955e78825c5e982c546254cd6f619b5234b79524e09d889c33b9d9371d7 category: dev optional: true - name: cycler @@ -1410,7 +1410,7 @@ package: category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: linux-64 dependencies: @@ -1421,14 +1421,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.56.0-py310h89163eb_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.57.0-py310h89163eb_0.conda hash: - md5: cd3125e1924bd8699dac9989652bca74 - sha256: 751599162ba980477e9267b67d82e116465d0cf69efc52e016e8f72e7f9cdfcd + md5: 34378af82141b3c1725dcdf898b28fc6 + sha256: 8b387f0906c8ea04f14eb449e1b58e01fb2cdc4b9a093edf6afdc9625c11cfd6 category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: win-64 dependencies: @@ -1440,10 +1440,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.56.0-py310h38315fa_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.57.0-py310h38315fa_0.conda hash: - md5: fd7c0f52022a6bbd9bc7f71c11faf59c - sha256: 2a431938b39c0ba7edf884c5a03ad6ef5f4ce67cb70f34a9bfac5730114f267f + md5: 1f25f742c39582715cc058f5fe451975 + sha256: bcb3848cb9cc0ff51284dfd91a7615d2c38ba0bd324b3c9764bd53ff0753a874 category: main optional: false - name: fqdn @@ -1840,6 +1840,20 @@ package: sha256: 77af6f5fe8b62ca07d09ac60127a30d9069fdc3c68d6b256754d0ffb1f7779f8 category: main optional: false +- name: icu + version: '75.1' + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + url: https://conda.anaconda.org/conda-forge/linux-64/icu-75.1-he02047a_0.conda + hash: + md5: 8b189310083baabfb622af68fd9d3ae3 + sha256: 71e750d509f5fa3421087ba88ef9a7b9be11c53174af3aa4d06aff4c18b38e8e + category: main + optional: false - name: idna version: '3.10' manager: conda @@ -2288,27 +2302,27 @@ package: category: main optional: false - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: jsonpointer @@ -3274,7 +3288,7 @@ package: category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: linux-64 dependencies: @@ -3285,15 +3299,15 @@ package: libssh2: '>=1.11.1,<2.0a0' libzlib: '>=1.3.1,<2.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.12.1-h332b0f4_0.conda + zstd: '>=1.5.7,<1.6.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.13.0-h332b0f4_0.conda hash: - md5: 45e9dc4e7b25e2841deb392be085500e - sha256: 2ebc3039af29269e4cdb858fca36265e5e400c1125a4bcd84ae73a596e0e76ca + md5: cbdc92ac0d93fe3c796e36ad65c7905c + sha256: 38e528acfaa0276b7052f4de44271ff9293fdb84579650601a8c49dac171482a category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: win-64 dependencies: @@ -3303,10 +3317,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.12.1-h88aaa65_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.13.0-h88aaa65_0.conda hash: - md5: 2b1c729d91f3b07502981b6e0c7727cc - sha256: 4c8e62fd32d59e5fbfad0f37e33083928bbb3c8800258650d4e7911e6f6fd1aa + md5: c9cf6eb842decbb66c2f34e72c3580d6 + sha256: 185553b37c0299b7a15dc66a7a7e2a0d421adaac784ec9298a0b2ad745116ca5 category: main optional: false - name: libdeflate @@ -3599,30 +3613,30 @@ package: category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.6.4-hb9d3cd8_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.8.1-hb9d3cd8_0.conda hash: - md5: 42d5b6a0f30d3c10cd88cb8584fda1cb - sha256: cad52e10319ca4585bc37f0bc7cce99ec7c15dc9168e42ccb96b741b0a27db3f + md5: 0e87378639676987af32fee53ba32258 + sha256: f4f21dfc54b08d462f707b771ecce3fa9bc702a2a05b55654f64154f48b141ef category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.6.4-h2466b09_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.8.1-h2466b09_0.conda hash: - md5: c48f6ad0ef0a555b27b233dfcab46a90 - sha256: 3f552b0bdefdd1459ffc827ea3bf70a6a6920c7879d22b6bfd0d73015b55227b + md5: 8d5cb0016b645d6688e2ff57c5d51302 + sha256: 1477e9bff05318f3129d37be0e64c76cce0973c4b8c73d13a467d0b7f03d157c category: main optional: false - name: libnghttp2 @@ -3950,35 +3964,37 @@ package: category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' + icu: '>=75.1,<76.0a0' libgcc: '>=13' libiconv: '>=1.18,<2.0a0' liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h0d44e9d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.14.0-h8d12d68_0.conda hash: - md5: 3ac6daa5c1210293a6deaec0c345b230 - sha256: d19b28caa42ac9c5ac2aa73f5f44947f78ab416467dc40926484f3afbcc31ed1 + md5: 216f67f6854b14054021b1a79515d657 + sha256: dbcd43a773ee40976a9a647014d485ae2ccec9d3f90538dcd77c077a7000d170 category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: win-64 dependencies: libiconv: '>=1.18,<2.0a0' + liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.13.7-he286e8c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.14.0-had0eb51_0.conda hash: - md5: aec4cf455e4c6cc2644abb348de7ff20 - sha256: 99182f93f1e7b678534df5f07ff94d7bf13a51386050f8fa9411fec764d0f39f + md5: 3e0c98df1bb9091893ca0dfe34985e20 + sha256: be5daa95e56605814b1d9de67a3dd895d20e0facae826c8e807783bc5cba9244 category: main optional: false - name: libzlib @@ -4035,29 +4051,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.1-h024ca30_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_0.conda hash: - md5: cfae5693f2ee2117e75e5e533451e04c - sha256: 4275d3b10e5c722a9321769e3aee91b9f879e0c527661d90cc38fa6320a9e765 + md5: 322da3c0641a7f0dafd5be6d3ea23d96 + sha256: 3a9e2098bea3d41a65e08d16c6ab01765ab4fc1cb419ff323c3df91fb5d3c7ae category: main optional: false - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.1-h30eaf37_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_0.conda hash: - md5: b46bba57bbefe505ea795880563ae6a3 - sha256: 6c090b43e11e2e02ee06c81e206fe6d664b35b3a5cd724033acde328f30f4581 + md5: 4f29c87e6d81e35cb06e871682566ba8 + sha256: 325a319a4309e869f85c91c25396eeb630775bc265fa418310b685333d79ecec category: main optional: false - name: locket @@ -5562,41 +5578,41 @@ package: category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: linux-64 dependencies: @@ -5605,14 +5621,14 @@ package: python: '' python_abi: 3.10.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.0-py310hc1293b2_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.1-py310hc1293b2_0.conda hash: - md5: ad0dbb22c4499b0fbb6778963bd4f035 - sha256: 98d6b74c13f90afb59f17df777e88c71a6adcd4c03958c2e6a264bce71ebe0a6 + md5: 24460b8a58d6d491be4088ffb5343f4b + sha256: 76992a2b50b98a43b66be401998b0b71f4bbb3cc0db456309263a604dddff086 category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: win-64 dependencies: @@ -5622,10 +5638,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/pydantic-core-2.33.0-py310h7c79e54_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pydantic-core-2.33.1-py310h7c79e54_0.conda hash: - md5: 7b9cf966da0d277d7c555f3a3070e8e8 - sha256: 9e4e90a62490f05874e6a14dbda9ccea25aa3dc09eb8fce73c6f74a38f39c561 + md5: 8e00f6b62285b0731e32dac4da060dd6 + sha256: 5d8ba398dd9ff5086b23d753ce2a9833894c99e5cea48861dbed55f4fa0c69aa category: main optional: false - name: pydata-sphinx-theme @@ -5930,22 +5946,22 @@ package: ld_impl_linux-64: '>=2.36.1' libffi: '>=3.4,<4.0a0' libgcc: '>=13' - liblzma: '>=5.6.3,<6.0a0' + liblzma: '>=5.6.4,<6.0a0' libnsl: '>=2.0.1,<2.1.0a0' - libsqlite: '>=3.47.0,<4.0a0' + libsqlite: '>=3.49.1,<4.0a0' libuuid: '>=2.38.1,<3.0a0' libxcrypt: '>=4.4.36' libzlib: '>=1.3.1,<2.0a0' ncurses: '>=6.5,<7.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' readline: '>=8.2,<9.0a0' tk: '>=8.6.13,<8.7.0a0' tzdata: '' - url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.16-he725a3c_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python-3.10.16-habfa6aa_2_cpython.conda hash: - md5: b887811a901b3aa622a92caf03bc8917 - sha256: 3f90a2d5062a73cd2dd8a0027718aee1db93f7975b9cfe529e2c9aeec2db262e + md5: 35e864ff2ec654d09fdc189706dfd139 + sha256: 0ab21c4738003a9f8d1d13089bf7d01e6633fcfb4f3265354899e3d39b935f3c category: main optional: false - name: python @@ -5955,20 +5971,20 @@ package: dependencies: bzip2: '>=1.0.8,<2.0a0' libffi: '>=3.4,<4.0a0' - liblzma: '>=5.6.3,<6.0a0' - libsqlite: '>=3.47.0,<4.0a0' + liblzma: '>=5.6.4,<6.0a0' + libsqlite: '>=3.49.1,<4.0a0' libzlib: '>=1.3.1,<2.0a0' - openssl: '>=3.4.0,<4.0a0' + openssl: '>=3.4.1,<4.0a0' pip: '' tk: '>=8.6.13,<8.7.0a0' tzdata: '' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/python-3.10.16-h37870fc_1_cpython.conda + url: https://conda.anaconda.org/conda-forge/win-64/python-3.10.16-hfdde91d_2_cpython.conda hash: - md5: 5c292a7bd9c32a256ba7939b3e6dee03 - sha256: 3392db6a7a90864d3fd1ce281859a49e27ee68121b63eece2ae6f1dbb2a8aaf1 + md5: d4d056da0f59dc89bf5155901f096428 + sha256: e6740bae3e9847a5a34c845f5bbd9b567f2a4eb4f561b620587d1756133a6091 category: main optional: false - name: python-dateutil @@ -6550,27 +6566,27 @@ package: category: dev optional: true - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: six @@ -8363,41 +8379,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8405,16 +8421,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8422,16 +8438,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: linux-64 dependencies: @@ -8443,16 +8459,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: win-64 dependencies: @@ -8464,12 +8480,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app @@ -8478,16 +8494,16 @@ package: platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: octree-creation-app @@ -8496,45 +8512,45 @@ package: platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 97b124e4..06382546 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -1434,7 +1434,7 @@ package: category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: linux-64 dependencies: @@ -1445,14 +1445,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.56.0-py311h2dc5d0c_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.57.0-py311h2dc5d0c_0.conda hash: - md5: ca3692015a53c7fcc248a324a540c54c - sha256: de9c238166cbff1b06c679395d3e3b0cf1e56969289ccdfb54404ed0a52256c7 + md5: 4175f366b41d3d0c80d02661a0a03473 + sha256: 2157fff1f143fc99f9b27d1358b537f08478eb65d917279a3484c9c8989ea5fc category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: win-64 dependencies: @@ -1464,10 +1464,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.56.0-py311h5082efb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.57.0-py311h5082efb_0.conda hash: - md5: 0ecd51b246e243291c68c7380e09b274 - sha256: bcfd53b83419d7a891eb77947dc1997c7b4133629988c0797404f76bdf2fe289 + md5: 9ecb6a80392fc77239da9cb631e9ab0c + sha256: 59938b42ed276e716af76b9795f37f2c2ba9b03ce79e820610b37d036d1b4101 category: main optional: false - name: fqdn @@ -1864,6 +1864,20 @@ package: sha256: 77af6f5fe8b62ca07d09ac60127a30d9069fdc3c68d6b256754d0ffb1f7779f8 category: main optional: false +- name: icu + version: '75.1' + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + url: https://conda.anaconda.org/conda-forge/linux-64/icu-75.1-he02047a_0.conda + hash: + md5: 8b189310083baabfb622af68fd9d3ae3 + sha256: 71e750d509f5fa3421087ba88ef9a7b9be11c53174af3aa4d06aff4c18b38e8e + category: main + optional: false - name: idna version: '3.10' manager: conda @@ -2340,27 +2354,27 @@ package: category: main optional: false - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: jsonpointer @@ -3326,7 +3340,7 @@ package: category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: linux-64 dependencies: @@ -3337,15 +3351,15 @@ package: libssh2: '>=1.11.1,<2.0a0' libzlib: '>=1.3.1,<2.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.12.1-h332b0f4_0.conda + zstd: '>=1.5.7,<1.6.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.13.0-h332b0f4_0.conda hash: - md5: 45e9dc4e7b25e2841deb392be085500e - sha256: 2ebc3039af29269e4cdb858fca36265e5e400c1125a4bcd84ae73a596e0e76ca + md5: cbdc92ac0d93fe3c796e36ad65c7905c + sha256: 38e528acfaa0276b7052f4de44271ff9293fdb84579650601a8c49dac171482a category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: win-64 dependencies: @@ -3355,10 +3369,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.12.1-h88aaa65_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.13.0-h88aaa65_0.conda hash: - md5: 2b1c729d91f3b07502981b6e0c7727cc - sha256: 4c8e62fd32d59e5fbfad0f37e33083928bbb3c8800258650d4e7911e6f6fd1aa + md5: c9cf6eb842decbb66c2f34e72c3580d6 + sha256: 185553b37c0299b7a15dc66a7a7e2a0d421adaac784ec9298a0b2ad745116ca5 category: main optional: false - name: libdeflate @@ -3678,30 +3692,30 @@ package: category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.6.4-hb9d3cd8_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.8.1-hb9d3cd8_0.conda hash: - md5: 42d5b6a0f30d3c10cd88cb8584fda1cb - sha256: cad52e10319ca4585bc37f0bc7cce99ec7c15dc9168e42ccb96b741b0a27db3f + md5: 0e87378639676987af32fee53ba32258 + sha256: f4f21dfc54b08d462f707b771ecce3fa9bc702a2a05b55654f64154f48b141ef category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.6.4-h2466b09_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.8.1-h2466b09_0.conda hash: - md5: c48f6ad0ef0a555b27b233dfcab46a90 - sha256: 3f552b0bdefdd1459ffc827ea3bf70a6a6920c7879d22b6bfd0d73015b55227b + md5: 8d5cb0016b645d6688e2ff57c5d51302 + sha256: 1477e9bff05318f3129d37be0e64c76cce0973c4b8c73d13a467d0b7f03d157c category: main optional: false - name: libnghttp2 @@ -4029,35 +4043,37 @@ package: category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' + icu: '>=75.1,<76.0a0' libgcc: '>=13' libiconv: '>=1.18,<2.0a0' liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h0d44e9d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.14.0-h8d12d68_0.conda hash: - md5: 3ac6daa5c1210293a6deaec0c345b230 - sha256: d19b28caa42ac9c5ac2aa73f5f44947f78ab416467dc40926484f3afbcc31ed1 + md5: 216f67f6854b14054021b1a79515d657 + sha256: dbcd43a773ee40976a9a647014d485ae2ccec9d3f90538dcd77c077a7000d170 category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: win-64 dependencies: libiconv: '>=1.18,<2.0a0' + liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.13.7-he286e8c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.14.0-had0eb51_0.conda hash: - md5: aec4cf455e4c6cc2644abb348de7ff20 - sha256: 99182f93f1e7b678534df5f07ff94d7bf13a51386050f8fa9411fec764d0f39f + md5: 3e0c98df1bb9091893ca0dfe34985e20 + sha256: be5daa95e56605814b1d9de67a3dd895d20e0facae826c8e807783bc5cba9244 category: main optional: false - name: libzlib @@ -4114,29 +4130,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.1-h024ca30_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_0.conda hash: - md5: cfae5693f2ee2117e75e5e533451e04c - sha256: 4275d3b10e5c722a9321769e3aee91b9f879e0c527661d90cc38fa6320a9e765 + md5: 322da3c0641a7f0dafd5be6d3ea23d96 + sha256: 3a9e2098bea3d41a65e08d16c6ab01765ab4fc1cb419ff323c3df91fb5d3c7ae category: main optional: false - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.1-h30eaf37_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_0.conda hash: - md5: b46bba57bbefe505ea795880563ae6a3 - sha256: 6c090b43e11e2e02ee06c81e206fe6d664b35b3a5cd724033acde328f30f4581 + md5: 4f29c87e6d81e35cb06e871682566ba8 + sha256: 325a319a4309e869f85c91c25396eeb630775bc265fa418310b685333d79ecec category: main optional: false - name: locket @@ -5643,41 +5659,41 @@ package: category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: linux-64 dependencies: @@ -5686,14 +5702,14 @@ package: python: '' python_abi: 3.11.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.0-py311h687327b_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.1-py311h687327b_0.conda hash: - md5: 590aeab0e5121d8973377cfc4cedf259 - sha256: 9ae39c0c401859e275495be27375aea92e0873d8ac45d9bc1fb245208a7f1522 + md5: 778b623dbbec0be25624b5ebd405a0a8 + sha256: f293f7f2d0fe11c8334b3671944b310c13c1552dbe25ea93043d09bede814cd5 category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: win-64 dependencies: @@ -5703,10 +5719,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/pydantic-core-2.33.0-py311ha250665_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pydantic-core-2.33.1-py311ha250665_0.conda hash: - md5: 9434db88b7c241fa39aecb8cfb172074 - sha256: 04ffcd9218de9ace25e4ffc694137a3f38258d5f59410033a453911534b717ac + md5: 549cc2f2754ba510f7616af5c5b8aff6 + sha256: bdbfb2e0a7e9f37071d1619dd9af33668bb47ba8f0117846742a5a7de3184bff category: main optional: false - name: pydata-sphinx-theme @@ -6633,27 +6649,27 @@ package: category: dev optional: true - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: six @@ -8477,41 +8493,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8519,16 +8535,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8536,16 +8552,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: linux-64 dependencies: @@ -8557,16 +8573,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: win-64 dependencies: @@ -8578,12 +8594,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app @@ -8592,16 +8608,16 @@ package: platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: octree-creation-app @@ -8610,45 +8626,45 @@ package: platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index e4a285be..5b8e685a 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -1434,7 +1434,7 @@ package: category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: linux-64 dependencies: @@ -1445,14 +1445,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* unicodedata2: '>=15.1.0' - url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.56.0-py312h178313f_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/fonttools-4.57.0-py312h178313f_0.conda hash: - md5: 2f8a66f2f9eb931cdde040d02c6ab54c - sha256: 76ca95b4111fe27e64d74111b416b3462ad3db99f7109cbdf50e6e4b67dcf5b7 + md5: 97907388593b27ac01237a1023d58d3d + sha256: 3d230ff0d9e9fc482de22b807adf017736bd6d19b932eea68d68eeb52b139e04 category: main optional: false - name: fonttools - version: 4.56.0 + version: 4.57.0 manager: conda platform: win-64 dependencies: @@ -1464,10 +1464,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.56.0-py312h31fea79_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/fonttools-4.57.0-py312h31fea79_0.conda hash: - md5: 7c08698c54ca6390314c19167c16745e - sha256: 31f245d4ceb7a8e9df8d292ff1efdb4be9a8fa7a9be7a1d0394465aa7f824d50 + md5: 5bcdfae9aaf166ad83edebfa2f6359e2 + sha256: eaa9fa1c6c0f290a24066a170460e292b111cb4c67c8d7cb7eb54ca68c608646 category: main optional: false - name: fqdn @@ -1864,6 +1864,20 @@ package: sha256: 77af6f5fe8b62ca07d09ac60127a30d9069fdc3c68d6b256754d0ffb1f7779f8 category: main optional: false +- name: icu + version: '75.1' + manager: conda + platform: linux-64 + dependencies: + __glibc: '>=2.17,<3.0.a0' + libgcc-ng: '>=12' + libstdcxx-ng: '>=12' + url: https://conda.anaconda.org/conda-forge/linux-64/icu-75.1-he02047a_0.conda + hash: + md5: 8b189310083baabfb622af68fd9d3ae3 + sha256: 71e750d509f5fa3421087ba88ef9a7b9be11c53174af3aa4d06aff4c18b38e8e + category: main + optional: false - name: idna version: '3.10' manager: conda @@ -2340,27 +2354,27 @@ package: category: main optional: false - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: json5 - version: 0.10.0 + version: 0.12.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/json5-0.10.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/json5-0.12.0-pyhd8ed1ab_0.conda hash: - md5: cd170f82d8e5b355dfdea6adab23e4af - sha256: 61bca2dac194c44603446944745566d7b4e55407280f6f6cea8bbe4de26b558f + md5: 56275442557b3b45752c10980abfe2db + sha256: 889e2a49de796475b5a4bc57d0ba7f4606b368ee2098e353a6d9a14b0e2c6393 category: dev optional: true - name: jsonpointer @@ -3326,7 +3340,7 @@ package: category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: linux-64 dependencies: @@ -3337,15 +3351,15 @@ package: libssh2: '>=1.11.1,<2.0a0' libzlib: '>=1.3.1,<2.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.12.1-h332b0f4_0.conda + zstd: '>=1.5.7,<1.6.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/libcurl-8.13.0-h332b0f4_0.conda hash: - md5: 45e9dc4e7b25e2841deb392be085500e - sha256: 2ebc3039af29269e4cdb858fca36265e5e400c1125a4bcd84ae73a596e0e76ca + md5: cbdc92ac0d93fe3c796e36ad65c7905c + sha256: 38e528acfaa0276b7052f4de44271ff9293fdb84579650601a8c49dac171482a category: main optional: false - name: libcurl - version: 8.12.1 + version: 8.13.0 manager: conda platform: win-64 dependencies: @@ -3355,10 +3369,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.12.1-h88aaa65_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libcurl-8.13.0-h88aaa65_0.conda hash: - md5: 2b1c729d91f3b07502981b6e0c7727cc - sha256: 4c8e62fd32d59e5fbfad0f37e33083928bbb3c8800258650d4e7911e6f6fd1aa + md5: c9cf6eb842decbb66c2f34e72c3580d6 + sha256: 185553b37c0299b7a15dc66a7a7e2a0d421adaac784ec9298a0b2ad745116ca5 category: main optional: false - name: libdeflate @@ -3678,30 +3692,30 @@ package: category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' libgcc: '>=13' - url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.6.4-hb9d3cd8_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/liblzma-5.8.1-hb9d3cd8_0.conda hash: - md5: 42d5b6a0f30d3c10cd88cb8584fda1cb - sha256: cad52e10319ca4585bc37f0bc7cce99ec7c15dc9168e42ccb96b741b0a27db3f + md5: 0e87378639676987af32fee53ba32258 + sha256: f4f21dfc54b08d462f707b771ecce3fa9bc702a2a05b55654f64154f48b141ef category: main optional: false - name: liblzma - version: 5.6.4 + version: 5.8.1 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.6.4-h2466b09_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/liblzma-5.8.1-h2466b09_0.conda hash: - md5: c48f6ad0ef0a555b27b233dfcab46a90 - sha256: 3f552b0bdefdd1459ffc827ea3bf70a6a6920c7879d22b6bfd0d73015b55227b + md5: 8d5cb0016b645d6688e2ff57c5d51302 + sha256: 1477e9bff05318f3129d37be0e64c76cce0973c4b8c73d13a467d0b7f03d157c category: main optional: false - name: libnghttp2 @@ -4029,35 +4043,37 @@ package: category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' + icu: '>=75.1,<76.0a0' libgcc: '>=13' libiconv: '>=1.18,<2.0a0' liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.13.7-h0d44e9d_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.14.0-h8d12d68_0.conda hash: - md5: 3ac6daa5c1210293a6deaec0c345b230 - sha256: d19b28caa42ac9c5ac2aa73f5f44947f78ab416467dc40926484f3afbcc31ed1 + md5: 216f67f6854b14054021b1a79515d657 + sha256: dbcd43a773ee40976a9a647014d485ae2ccec9d3f90538dcd77c077a7000d170 category: main optional: false - name: libxml2 - version: 2.13.7 + version: 2.14.0 manager: conda platform: win-64 dependencies: libiconv: '>=1.18,<2.0a0' + liblzma: '>=5.6.4,<6.0a0' libzlib: '>=1.3.1,<2.0a0' ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.13.7-he286e8c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/libxml2-2.14.0-had0eb51_0.conda hash: - md5: aec4cf455e4c6cc2644abb348de7ff20 - sha256: 99182f93f1e7b678534df5f07ff94d7bf13a51386050f8fa9411fec764d0f39f + md5: 3e0c98df1bb9091893ca0dfe34985e20 + sha256: be5daa95e56605814b1d9de67a3dd895d20e0facae826c8e807783bc5cba9244 category: main optional: false - name: libzlib @@ -4114,29 +4130,29 @@ package: category: dev optional: true - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: linux-64 dependencies: __glibc: '>=2.17,<3.0.a0' - url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.1-h024ca30_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/llvm-openmp-20.1.2-h024ca30_0.conda hash: - md5: cfae5693f2ee2117e75e5e533451e04c - sha256: 4275d3b10e5c722a9321769e3aee91b9f879e0c527661d90cc38fa6320a9e765 + md5: 322da3c0641a7f0dafd5be6d3ea23d96 + sha256: 3a9e2098bea3d41a65e08d16c6ab01765ab4fc1cb419ff323c3df91fb5d3c7ae category: main optional: false - name: llvm-openmp - version: 20.1.1 + version: 20.1.2 manager: conda platform: win-64 dependencies: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.1-h30eaf37_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/llvm-openmp-20.1.2-h30eaf37_0.conda hash: - md5: b46bba57bbefe505ea795880563ae6a3 - sha256: 6c090b43e11e2e02ee06c81e206fe6d664b35b3a5cd724033acde328f30f4581 + md5: 4f29c87e6d81e35cb06e871682566ba8 + sha256: 325a319a4309e869f85c91c25396eeb630775bc265fa418310b685333d79ecec category: main optional: false - name: locket @@ -5643,41 +5659,41 @@ package: category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: linux-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic - version: 2.11.1 + version: 2.11.2 manager: conda platform: win-64 dependencies: annotated-types: '>=0.6.0' - pydantic-core: 2.33.0 + pydantic-core: 2.33.1 python: '>=3.9' typing-extensions: '>=4.6.1' typing-inspection: '>=0.4.0' typing_extensions: '>=4.12.2' - url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.1-pyh3cfb1c2_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/pydantic-2.11.2-pyh3cfb1c2_0.conda hash: - md5: f5e18ca78d6adb76558d557fc9b55486 - sha256: d134343e228f0cc40cadb3153af68edb1554aaf1b1e6f03d88bbf6a4a548a88b + md5: b866355462b3acc820777fb7c0719a5c + sha256: 848cf4ebb403e34d76575fbf59f1e96aed1761f5a295db2784b7ba0ddc36bf84 category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: linux-64 dependencies: @@ -5686,14 +5702,14 @@ package: python: '' python_abi: 3.12.* typing-extensions: '>=4.6.0,!=4.7.0' - url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.0-py312h3b7be25_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pydantic-core-2.33.1-py312h3b7be25_0.conda hash: - md5: 9510f083be07448f555769fbfd5058d8 - sha256: 0a0fea7b396a68f8aab48eec0cfdd97455a8e91875bcaa4dca187518b3a554df + md5: 4767e28fcbf646ffc18ef4021534c415 + sha256: 281dc40103c324309bf62cf9ed861f38e949b8b1da786f25e5ad199a86a67a6d category: main optional: false - name: pydantic-core - version: 2.33.0 + version: 2.33.1 manager: conda platform: win-64 dependencies: @@ -5703,10 +5719,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/pydantic-core-2.33.0-py312hfe1d9c4_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pydantic-core-2.33.1-py312hfe1d9c4_0.conda hash: - md5: 7853e720dec119785fb739a121480cd4 - sha256: 70599c5cc098bdbc938efc961b62a7f49e93bc51e6ce860f6ed92432e8fc63a8 + md5: 08c86823811befb8a83b9f403815e6ab + sha256: 67b51ddb720d738c3eee96e7998d7a5b99530893f373714555f4941b15d1bd70 category: main optional: false - name: pydata-sphinx-theme @@ -6633,27 +6649,27 @@ package: category: dev optional: true - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: setuptools - version: 75.8.2 + version: 78.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/setuptools-75.8.2-pyhff2d567_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/setuptools-78.1.0-pyhff2d567_0.conda hash: - md5: 9bddfdbf4e061821a1a443f93223be61 - sha256: 91d664ace7c22e787775069418daa9f232ee8bafdd0a6a080a5ed2395a6fa6b2 + md5: a42da9837e46c53494df0044c3eb1f53 + sha256: d4c74d2140f2fbc72fe5320cbd65f3fd1d1f7832ab4d7825c37c38ab82440ae2 category: main optional: false - name: six @@ -8477,41 +8493,41 @@ package: category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoapps-utils - version: 0.5.0-alpha.1 + version: 0.5.0-alpha.3 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 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@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 hash: - sha256: 02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + sha256: fb08b8e877a84d0070cb0793acdf9833ea2c0143 source: type: url - url: git+https://github.com/MiraGeoscience/geoapps-utils.git@02f6fd3aa7530dc81fe2e32e7e2c874b429daaf7 + url: git+https://github.com/MiraGeoscience/geoapps-utils.git@fb08b8e877a84d0070cb0793acdf9833ea2c0143 category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: linux-64 dependencies: @@ -8519,16 +8535,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: geoh5py - version: 0.11.0-alpha.2 + version: 0.11.0-alpha.3 manager: pip platform: win-64 dependencies: @@ -8536,16 +8552,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@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef hash: - sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad + sha256: 6298fedb4b2461f7a28686318569aa37bfd3b7ef source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad + url: git+https://github.com/MiraGeoscience/geoh5py.git@6298fedb4b2461f7a28686318569aa37bfd3b7ef category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: linux-64 dependencies: @@ -8557,16 +8573,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev18+ga365076ef + version: 0.21.2.3a2.dev19+gad5b2c663 manager: pip platform: win-64 dependencies: @@ -8578,12 +8594,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b hash: - sha256: a365076ef89082143a3a460df55e2db301af849c + sha256: ad5b2c663795d29216d127679ee121fb13a4d78b source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c + url: git+https://github.com/MiraGeoscience/simpeg.git@ad5b2c663795d29216d127679ee121fb13a4d78b category: main optional: false - name: octree-creation-app @@ -8592,16 +8608,16 @@ package: platform: linux-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: octree-creation-app @@ -8610,45 +8626,45 @@ package: platform: win-64 dependencies: discretize: ==0.11.* - geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.2 + geoapps-utils: 0.5.0-alpha.3 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' scipy: '>=1.14.0,<1.15.0' - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 hash: - sha256: c1797da5ca947c6f48555ea7f7680c0c63c1c456 + sha256: 0eb56555b350bbe4cabc51de2dbb2ee982f46822 source: type: url - url: git+https://github.com/MiraGeoscience/octree-creation-app.git@c1797da5ca947c6f48555ea7f7680c0c63c1c456 + url: git+https://github.com/MiraGeoscience/octree-creation-app.git@0eb56555b350bbe4cabc51de2dbb2ee982f46822 category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false - name: param-sweeps - version: 0.3.0-alpha.1 + version: 0.3.0-alpha.2 manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.2 + geoh5py: 0.11.0-alpha.3 numpy: '>=1.26.0,<1.27.0' - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e hash: - sha256: 6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + sha256: 60144cba8e10e4794d63997e1982d4b5a9af943e source: type: url - url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 + url: git+https://github.com/MiraGeoscience/param-sweeps.git@60144cba8e10e4794d63997e1982d4b5a9af943e category: main optional: false From 3c3433a1059994ff98d30705f0ac31917655a3c3 Mon Sep 17 00:00:00 2001 From: benjamink Date: Mon, 7 Apr 2025 13:45:25 -0700 Subject: [PATCH 5/6] fix warnings round 73. --- .../uijson/direct_current_3d_forward.ui.json | 1 + .../uijson/fdem1d_forward.ui.json | 10 +++++++ .../uijson/fdem1d_inversion.ui.json | 24 ++++++++++++++++ .../induced_polarization_2d_forward.ui.json | 7 ----- .../induced_polarization_2d_inversion.ui.json | 2 ++ .../induced_polarization_3d_inversion.ui.json | 1 + ...ced_polarization_batch2d_inversion.ui.json | 3 +- .../joint_cross_gradient_inversion.ui.json | 12 ++++++++ .../uijson/joint_surveys_inversion.ui.json | 1 + .../uijson/tdem1d_forward.ui.json | 25 ++++++++++++++++- .../uijson/tdem1d_inversion.ui.json | 28 +++++++++++++++++++ .../three_dimensions/params.py | 2 ++ .../two_dimensions/params.py | 2 ++ .../frequency_domain_1d/params.py | 3 +- tests/run_tests/driver_ip_b2d_test.py | 1 - 15 files changed, 111 insertions(+), 11 deletions(-) diff --git a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json index c81f46aa..922ab8d7 100644 --- a/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/direct_current_3d_forward.ui.json @@ -105,6 +105,7 @@ "parent": "mesh", "value": "" }, + "save_sensitivities": false, "n_cpu": { "min": 1, "group": "Compute", diff --git a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json index 0231c1c2..ad6024e3 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_forward.ui.json @@ -32,6 +32,11 @@ "label": "Z imag component", "value": true }, + "u_cell_size": { + "visible": false, + "label": "Vertical core cell size (m)", + "value": 0.0 + }, "v_cell_size": { "min": 0.0, "group": "1D Mesh", @@ -48,6 +53,11 @@ "label": "Depth of core (m)", "value": 500.0 }, + "horizontal_padding": { + "visible": false, + "label": "Horizontal padding (m)", + "value": 1000.0 + }, "vertical_padding": { "min": 0.0, "group": "1D Mesh", diff --git a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json index a0d7347b..b5995261 100644 --- a/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/fdem1d_inversion.ui.json @@ -80,6 +80,11 @@ "dependencyType": "enabled", "value": "" }, + "u_cell_size": { + "visible": false, + "label": "Vertical core cell size (m)", + "value": 0.0 + }, "v_cell_size": { "min": 0.0, "group": "1D Mesh", @@ -96,6 +101,11 @@ "label": "Depth of core (m)", "value": 500.0 }, + "horizontal_padding": { + "visible": false, + "label": "Horizontal padding (m)", + "value": 1000.0 + }, "vertical_padding": { "min": 0.0, "group": "1D Mesh", @@ -272,6 +282,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -285,6 +296,7 @@ "property": "", "enabled": true }, + "gradient_rotation": "", "s_norm": { "association": "Cell", "dataType": "Float", @@ -319,6 +331,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", @@ -557,6 +570,17 @@ "value": "ram", "visible": false }, + "max_chunk_size": { + "min": 0, + "group": "Compute", + "optional": true, + "enabled": true, + "label": "Maximum chunk size (Mb)", + "value": 128, + "verbose": 3, + "visible": false, + "tooltip": "Limit the chunk size used by Dask for distributed computation." + }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json index a9341ec1..cb667244 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_forward.ui.json @@ -219,13 +219,6 @@ "visible": false, "tooltip": "Limit the chunk size used by Dask for distributed computation." }, - "chunk_by_rows": { - "group": "Compute", - "label": "Chunk by rows", - "value": true, - "verbose": 3, - "visible": false - }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json index 940c72e0..5308b645 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_2d_inversion.ui.json @@ -273,6 +273,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -332,6 +333,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", diff --git a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json index 829f197e..0edd0780 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_3d_inversion.ui.json @@ -435,6 +435,7 @@ "enabled": true, "tooltip": "Set the number of iterations per beta value. Use higher values for more non-linear optimization problems." }, + "epsilon_cooling_factor": 1.2, "max_global_iterations": { "min": 1, "lineEdit": false, diff --git a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json index bec2dade..e0cedc9e 100644 --- a/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/induced_polarization_batch2d_inversion.ui.json @@ -228,7 +228,6 @@ "parent": "mesh", "value": "" }, - "output_tile_files": false, "alpha_s": { "min": 0.0, "group": "Regularization", @@ -257,6 +256,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -316,6 +316,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", diff --git a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json index 03185f01..a1bd05e4 100644 --- a/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_cross_gradient_inversion.ui.json @@ -186,6 +186,17 @@ "value": 1.0, "enabled": false }, + "gradient_rotation": { + "group": "Regularization", + "association": "Cell", + "dataType": "Float", + "dataGroupType": "Dip direction & dip", + "label": "Gradient rotation", + "optional": true, + "enabled": false, + "parent": "mesh", + "value": "" + }, "s_norm": { "min": 0.0, "max": 2.0, @@ -425,6 +436,7 @@ "value": "Pardiso" }, "tile_spatial": 1, + "parallelized": true, "store_sensitivities": { "choiceList": [ "disk", diff --git a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json index 3cf0c145..ab10d1dc 100644 --- a/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/joint_surveys_inversion.ui.json @@ -512,6 +512,7 @@ "tooltip": "Direct solver to use for the forward calculations", "value": "Pardiso" }, + "parallelized": true, "tile_spatial": 1, "store_sensitivities": { "choiceList": [ diff --git a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json index 8570a596..3d5cd76e 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_forward.ui.json @@ -9,7 +9,7 @@ "monitoring_directory": "", "workspace_geoh5": "", "inversion_type": "tdem 1d", - "physical property": "conductivity", + "physical_property": "conductivity", "forward_only": true, "data_object": { "main": true, @@ -33,12 +33,19 @@ "tooltip": "Set the units of the data.", "value": "dB/dt (T/s)" }, + "x_channel_bool": false, + "y_channel_bool": false, "z_channel_bool": { "group": "Survey", "main": true, "label": "Z component", "value": true }, + "u_cell_size": { + "visible": false, + "label": "Vertical core cell size (m)", + "value": 0.0 + }, "v_cell_size": { "min": 0.0, "group": "1D Mesh", @@ -55,6 +62,11 @@ "label": "Depth of core (m)", "value": 500.0 }, + "horizontal_padding": { + "visible": false, + "label": "Vertical padding (m)", + "value": 0.0 + }, "vertical_padding": { "min": 0.0, "group": "1D Mesh", @@ -189,6 +201,17 @@ "visible": false, "tooltip": "Splits the objective function into spatial tiles for distributed computation using the Dask library." }, + "max_chunk_size": { + "min": 0, + "group": "Compute", + "optional": true, + "enabled": true, + "label": "Maximum chunk size (Mb)", + "value": 128, + "verbose": 3, + "visible": false, + "tooltip": "Limit the chunk size used by Dask for distributed computation." + }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json index d173d1a1..7c473ff0 100644 --- a/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/tdem1d_inversion.ui.json @@ -33,6 +33,8 @@ "tooltip": "Set the units of the data.", "value": "dB/dt (T/s)" }, + "x_channel": "", + "y_channel": "", "z_channel": { "association": [ "Cell", @@ -48,6 +50,8 @@ "enabled": true, "value": "" }, + "x_uncertainty": "", + "y_uncertainty": "", "z_uncertainty": { "association": [ "Cell", @@ -63,6 +67,11 @@ "dependencyType": "enabled", "value": "" }, + "u_cell_size": { + "visible": false, + "label": "Vertical core cell size (m)", + "value": 0.0 + }, "v_cell_size": { "min": 0.0, "group": "1D Mesh", @@ -79,6 +88,11 @@ "label": "Depth of core (m)", "value": 500.0 }, + "horizontal_padding": { + "visible": false, + "label": "Vertical padding (m)", + "value": 0.0 + }, "vertical_padding": { "min": 0.0, "group": "1D Mesh", @@ -250,6 +264,7 @@ "property": "", "enabled": true }, + "length_scale_y": "", "length_scale_z": { "min": 0.0, "group": "Regularization", @@ -263,6 +278,7 @@ "property": "", "enabled": true }, + "gradient_rotation": "", "s_norm": { "association": "Cell", "dataType": "Float", @@ -297,6 +313,7 @@ "enabled": true, "tooltip": "Lp-norm used in the x-smoothness term of the objective function." }, + "y_norm": "", "z_norm": { "association": "Cell", "dataType": "Float", @@ -534,6 +551,17 @@ "value": "ram", "visible": false }, + "max_chunk_size": { + "min": 0, + "group": "Compute", + "optional": true, + "enabled": true, + "label": "Maximum chunk size (Mb)", + "value": 128, + "verbose": 3, + "visible": false, + "tooltip": "Limit the chunk size used by Dask for distributed computation." + }, "out_group": { "label": "SimPEG group", "value": "", diff --git a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py index 83a001bc..b4ec8254 100644 --- a/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/three_dimensions/params.py @@ -38,6 +38,7 @@ class IP3DForwardOptions(BaseForwardOptions): inversion_type: str = "induced polarization 3d" chargeability_channel_bool: bool = True + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData @@ -61,5 +62,6 @@ class IP3DInversionOptions(BaseInversionOptions): chargeability_channel: FloatData chargeability_uncertainty: float | FloatData | None = None + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData lower_bound: float | FloatData | None = 0.0 diff --git a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py index 323726c7..1cdda7e8 100644 --- a/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py +++ b/simpeg_drivers/electricals/induced_polarization/two_dimensions/params.py @@ -50,6 +50,7 @@ class IP2DForwardOptions(BaseForwardOptions): line_selection: LineSelectionOptions mesh: DrapeModel | None = None drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData @@ -81,6 +82,7 @@ class IP2DInversionOptions(BaseInversionOptions): line_selection: LineSelectionOptions mesh: DrapeModel | None = None drape_model: DrapeModelOptions = DrapeModelOptions() + model_type: str = "Conductivity (S/m)" conductivity_model: float | FloatData lower_bound: float | FloatData | None = 0.0 length_scale_y: None = None diff --git a/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py b/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py index d56bc2a8..25806a0d 100644 --- a/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py +++ b/simpeg_drivers/electromagnetics/frequency_domain_1d/params.py @@ -67,7 +67,6 @@ class FDEM1DInversionOptions(FDEMInversionOptions): title: str = "Frequency-domain EM-1D (FEM-1D) Inversion" inversion_type: str = "fdem 1d" - y_norm: None = None drape_model: DrapeModelOptions = DrapeModelOptions( u_cell_size=10.0, v_cell_size=10.0, @@ -78,3 +77,5 @@ class FDEM1DInversionOptions(FDEMInversionOptions): ) auto_scale_misfits: bool = False sens_wts_threshold: float = 100.0 + length_scale_y: None = None + y_norm: None = None diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py index 2209b94b..ee80b1ea 100644 --- a/tests/run_tests/driver_ip_b2d_test.py +++ b/tests/run_tests/driver_ip_b2d_test.py @@ -130,7 +130,6 @@ def test_ip_p3d_run( length_scale_x=1.0, length_scale_z=1.0, gradient_type="components", - chargeability_channel_bool=True, max_global_iterations=max_iterations, initial_beta=None, initial_beta_ratio=1e0, From 65819fedb549016119d97d27af3c5b5a96306cf0 Mon Sep 17 00:00:00 2001 From: benjamink Date: Wed, 9 Apr 2025 11:56:06 -0700 Subject: [PATCH 6/6] fix warnings on data_test and drivers_test --- tests/data_test.py | 1 - tests/driver_test.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/data_test.py b/tests/data_test.py index 084d44b2..11ed82a9 100644 --- a/tests/data_test.py +++ b/tests/data_test.py @@ -128,7 +128,6 @@ def test_survey_data(tmp_path: Path): mesh=mesh, starting_model=0.0, tile_spatial=2, - resolution=0.0, ) driver = MVIInversionDriver(params) diff --git a/tests/driver_test.py b/tests/driver_test.py index 41e10969..a0c44fd9 100644 --- a/tests/driver_test.py +++ b/tests/driver_test.py @@ -46,7 +46,6 @@ def test_smallness_terms(tmp_path: Path): alpha_s=1.0, s_norm=0.0, gradient_type="components", - gz_channel_bool=True, gz_channel=gz, gz_uncertainty=2e-3, lower_bound=0.0,