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 5649b4e5..b1120fa2 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -218,7 +218,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=5_cp310 + - python_abi=3.10=6_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - pyzmq=26.3.0=py310h71f11fc_0 @@ -259,7 +259,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -299,8 +299,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.10-linux-64.conda.lock.yml b/environments/py-3.10-linux-64.conda.lock.yml index ecb06df6..0f865612 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -118,7 +118,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py310h6410a28_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=5_cp310 + - python_abi=3.10=6_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - readline=8.2=h8c095d6_2 @@ -128,7 +128,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 @@ -152,8 +152,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 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 f5bcf1dc..59080e2c 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -202,7 +202,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=5_cp310 + - python_abi=3.10=6_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pywin32=307=py310h9e98ed7_3 - pywinpty=2.0.15=py310h9e98ed7_0 @@ -244,7 +244,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -290,8 +290,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.10-win-64.conda.lock.yml b/environments/py-3.10-win-64.conda.lock.yml index fc731969..9d67542d 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -103,7 +103,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py310hb64895d_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.10=5_cp310 + - python_abi=3.10=6_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h38315fa_2 - scikit-learn=1.4.2=py310hf2a6c47_1 @@ -112,7 +112,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 @@ -141,8 +141,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 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 d110992f..f745b369 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -221,7 +221,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=5_cp311 + - python_abi=3.11=6_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - pyzmq=26.3.0=py311h7deb3e3_0 @@ -262,7 +262,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -303,8 +303,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.11-linux-64.conda.lock.yml b/environments/py-3.11-linux-64.conda.lock.yml index 5cbea1ac..49a6b8db 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -120,7 +120,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h4b558b0_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=5_cp311 + - python_abi=3.11=6_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - readline=8.2=h8c095d6_2 @@ -130,7 +130,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 @@ -155,8 +155,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 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 30826d14..4ddd101b 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -205,7 +205,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=5_cp311 + - python_abi=3.11=6_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pywin32=307=py311hda3d55a_3 - pywinpty=2.0.15=py311hda3d55a_0 @@ -247,7 +247,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -294,8 +294,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.11-win-64.conda.lock.yml b/environments/py-3.11-win-64.conda.lock.yml index d660be09..710fc320 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -105,7 +105,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py311h5bfbc98_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.11=5_cp311 + - python_abi=3.11=6_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h5082efb_2 - scikit-learn=1.4.2=py311hdcb8d17_1 @@ -114,7 +114,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 @@ -144,8 +144,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 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 4c9188b4..6bb6d659 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -221,7 +221,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=5_cp312 + - python_abi=3.12=6_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - pyzmq=26.3.0=py312hbf22597_0 @@ -262,7 +262,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh0d859eb_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -303,8 +303,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.12-linux-64.conda.lock.yml b/environments/py-3.12-linux-64.conda.lock.yml index 3d864017..22469b69 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -120,7 +120,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h6ad3ee3_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=5_cp312 + - python_abi=3.12=6_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - readline=8.2=h8c095d6_2 @@ -130,7 +130,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 @@ -155,8 +155,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 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 3907a261..59ae93a0 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -205,7 +205,7 @@ dependencies: - python-json-logger=2.0.7=pyhd8ed1ab_0 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=5_cp312 + - python_abi=3.12=6_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pywin32=307=py312h275cf98_3 - pywinpty=2.0.15=py312h275cf98_0 @@ -247,7 +247,7 @@ dependencies: - stack_data=0.6.3=pyhd8ed1ab_1 - tabulate=0.9.0=pyhd8ed1ab_2 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - terminado=0.18.1=pyh5737063_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 @@ -294,8 +294,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/environments/py-3.12-win-64.conda.lock.yml b/environments/py-3.12-win-64.conda.lock.yml index 3c83d2fb..1ebc636f 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -105,7 +105,7 @@ dependencies: - python-dateutil=2.9.0.post0=pyhff2d567_1 - python-mumps=0.0.3=py312h8095395_0 - python-tzdata=2025.2=pyhd8ed1ab_0 - - python_abi=3.12=5_cp312 + - python_abi=3.12=6_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h31fea79_2 - scikit-learn=1.4.2=py312h816cc57_1 @@ -114,7 +114,7 @@ dependencies: - six=1.17.0=pyhd8ed1ab_0 - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - - tblib=3.0.0=pyhd8ed1ab_1 + - tblib=3.1.0=pyhd8ed1ab_0 - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 @@ -144,8 +144,8 @@ dependencies: - 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@8bbd69efa7fbac07af1b878024c948e126b98c41 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + - 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 diff --git a/py-3.10.conda-lock.yml b/py-3.10.conda-lock.yml index a7d6c8c8..f29365aa 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -6111,10 +6111,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.10-5_cp310.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.10-6_cp310.conda hash: - md5: 2921c34715e74b3587b4cff4d36844f9 - sha256: 074d2f0b31f0333b7e553042b17ea54714b74263f8adda9a68a4bd8c7e219971 + md5: 01f0f2104b8466714804a72e511de599 + sha256: 716287b4c15fb9a78b49a627dd7057c9fc7a29c6d4056b506fc84dab2cd2ca85 category: main optional: false - name: python_abi @@ -6122,10 +6122,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.10-5_cp310.conda + url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.10-6_cp310.conda hash: - md5: 3c510f4c4383f5fbdb12fdd971b30d49 - sha256: 0671bea4d5c5b8618ee7e2b1117d5a90901348ac459db57b654007f1644fa087 + md5: 041cd0bfc8be015fbd78b5b2fe9b168e + sha256: 27015f67c4cea426e16cdc8054a1a3f9e78825c2e9b8a594a34e0feb9f7de606 category: main optional: false - name: pytz @@ -7305,27 +7305,27 @@ package: category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: terminado @@ -8367,7 +8367,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8384,7 +8384,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8397,7 +8397,7 @@ package: category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: linux-64 dependencies: @@ -8405,16 +8405,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: win-64 dependencies: @@ -8422,16 +8422,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: linux-64 dependencies: @@ -8443,16 +8443,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: win-64 dependencies: @@ -8464,12 +8464,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: octree-creation-app @@ -8479,7 +8479,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8497,7 +8497,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8513,7 +8513,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: @@ -8528,7 +8528,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 33aa7b74..97b124e4 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -6194,10 +6194,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-5_cp311.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.11-6_cp311.conda hash: - md5: 139a8d40c8a2f430df31048949e450de - sha256: 2660b8059b3ee854bc5d3c6b1fce946e5bd2fe8fbca7827de2c5885ead6209de + md5: 37ec65e056b9964529c0e1e2697b9955 + sha256: 2ff22fffe5bb93802c1687b5c4a34b9062394b78f23cfb5c1c1ef9b635bb030e category: main optional: false - name: python_abi @@ -6205,10 +6205,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.11-5_cp311.conda + url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.11-6_cp311.conda hash: - md5: 895b873644c11ccc0ab7dba2d8513ae6 - sha256: 9b210e5807dd9c9ed71ff192a95f1872da597ddd10e7cefec93a922fe22e598a + md5: 0cdb3079c532b4d216bc9efacd510138 + sha256: 82b09808cc4f80212be7539d542d5853e0aaa593bc715f02b831c0ea0552b8bf category: main optional: false - name: pytz @@ -7388,27 +7388,27 @@ package: category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: terminado @@ -8481,7 +8481,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8498,7 +8498,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8511,7 +8511,7 @@ package: category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: linux-64 dependencies: @@ -8519,16 +8519,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: win-64 dependencies: @@ -8536,16 +8536,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: linux-64 dependencies: @@ -8557,16 +8557,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: win-64 dependencies: @@ -8578,12 +8578,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: octree-creation-app @@ -8593,7 +8593,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8611,7 +8611,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8627,7 +8627,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: @@ -8642,7 +8642,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 50c83b71..e4a285be 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -6194,10 +6194,10 @@ package: manager: conda platform: linux-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-5_cp312.conda + url: https://conda.anaconda.org/conda-forge/linux-64/python_abi-3.12-6_cp312.conda hash: - md5: 0424ae29b104430108f5218a66db7260 - sha256: d10e93d759931ffb6372b45d65ff34d95c6000c61a07e298d162a3bc2accebb0 + md5: 95bd67b1113859774c30418e8481f9d8 + sha256: 09aff7ca31d1dbee63a504dba89aefa079b7c13a50dae18e1fe40a40ea71063e category: main optional: false - name: python_abi @@ -6205,10 +6205,10 @@ package: manager: conda platform: win-64 dependencies: {} - url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.12-5_cp312.conda + url: https://conda.anaconda.org/conda-forge/win-64/python_abi-3.12-6_cp312.conda hash: - md5: e8681f534453af7afab4cd2bc1423eec - sha256: 9486662af81a219e96d343449eff242f38d7c5128ced5ce5acf85857265058d6 + md5: fd9176ac032bea8da0cfcc6fa3f724f1 + sha256: a36a7ba34e5e459da2ba89c3b4021798db26768562f01c00f07a6b33f4a16987 category: main optional: false - name: pytz @@ -7388,27 +7388,27 @@ package: category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: tblib - version: 3.0.0 + version: 3.1.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.0.0-pyhd8ed1ab_1.conda + url: https://conda.anaconda.org/conda-forge/noarch/tblib-3.1.0-pyhd8ed1ab_0.conda hash: - md5: 60ce69f73f3e75b21f1c27b1b471320c - sha256: 6869cd2e043426d30c84d0ff6619f176b39728f9c75dc95dca89db994548bb8a + md5: a15c62b8a306b8978f094f76da2f903f + sha256: a83c83f5e622a2f34fb1d179c55c3ff912429cd0a54f9f3190ae44a0fdba2ad2 category: main optional: false - name: terminado @@ -8481,7 +8481,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8498,7 +8498,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' pydantic: '>=2.5.2,<3.0.0' scipy: '>=1.14.0,<1.15.0' @@ -8511,7 +8511,7 @@ package: category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: linux-64 dependencies: @@ -8519,16 +8519,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: geoh5py - version: 0.11.0-alpha.1 + version: 0.11.0-alpha.2 manager: pip platform: win-64 dependencies: @@ -8536,16 +8536,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@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad hash: - sha256: 8bbd69efa7fbac07af1b878024c948e126b98c41 + sha256: 117b245c90b38380e6b953368e5332bdfb4cbaad source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@8bbd69efa7fbac07af1b878024c948e126b98c41 + url: git+https://github.com/MiraGeoscience/geoh5py.git@117b245c90b38380e6b953368e5332bdfb4cbaad category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: linux-64 dependencies: @@ -8557,16 +8557,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: mira-simpeg - version: 0.21.2.3a2.dev16+g49f567984 + version: 0.21.2.3a2.dev18+ga365076ef manager: pip platform: win-64 dependencies: @@ -8578,12 +8578,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c hash: - sha256: 49f5679848e1d5a5703b749512b6005589947718 + sha256: a365076ef89082143a3a460df55e2db301af849c source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@49f5679848e1d5a5703b749512b6005589947718 + url: git+https://github.com/MiraGeoscience/simpeg.git@a365076ef89082143a3a460df55e2db301af849c category: main optional: false - name: octree-creation-app @@ -8593,7 +8593,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8611,7 +8611,7 @@ package: dependencies: discretize: ==0.11.* geoapps-utils: 0.5.0-alpha.1 - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 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 @@ -8627,7 +8627,7 @@ package: manager: pip platform: linux-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: @@ -8642,7 +8642,7 @@ package: manager: pip platform: win-64 dependencies: - geoh5py: 0.11.0-alpha.1 + geoh5py: 0.11.0-alpha.2 numpy: '>=1.26.0,<1.27.0' url: git+https://github.com/MiraGeoscience/param-sweeps.git@6bf4ac8a7fc6c111216e8042a075f9e92ce38d41 hash: diff --git a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json index 20defc67..cd0167ef 100644 --- a/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_scalar_inversion.ui.json @@ -410,7 +410,7 @@ "property": "", "optional": true, "value": 0.0, - "enabled": false + "enabled": true }, "upper_bound": { "association": [ diff --git a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json index d08a75f0..8916be7e 100644 --- a/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json +++ b/simpeg_drivers-assets/uijson/magnetic_vector_inversion.ui.json @@ -410,6 +410,7 @@ "property": "", "optional": true, "value": 0.0, + "visible": false, "enabled": false }, "upper_bound": { diff --git a/simpeg_drivers/components/models.py b/simpeg_drivers/components/models.py index 32c46188..413e997f 100644 --- a/simpeg_drivers/components/models.py +++ b/simpeg_drivers/components/models.py @@ -190,6 +190,12 @@ def lower_bound(self) -> np.ndarray | None: else: bound_model = self._lower_bound.model + if ( + self.driver.params.inversion_type == "magnetic vector" + and self._upper_bound.model is not None + ): + bound_model = -self._upper_bound.model + if bound_model is None: return -np.inf diff --git a/simpeg_drivers/potential_fields/magnetic_scalar/params.py b/simpeg_drivers/potential_fields/magnetic_scalar/params.py index e0748e9b..d032e15a 100644 --- a/simpeg_drivers/potential_fields/magnetic_scalar/params.py +++ b/simpeg_drivers/potential_fields/magnetic_scalar/params.py @@ -118,3 +118,4 @@ class MagneticInversionOptions(BaseInversionOptions): inducing_field_strength: float | FloatData inducing_field_inclination: float | FloatData inducing_field_declination: float | FloatData + lower_bound: float | FloatData | None = 0.0 diff --git a/simpeg_drivers/potential_fields/magnetic_vector/params.py b/simpeg_drivers/potential_fields/magnetic_vector/params.py index 1be6d7a2..ef0b9973 100644 --- a/simpeg_drivers/potential_fields/magnetic_vector/params.py +++ b/simpeg_drivers/potential_fields/magnetic_vector/params.py @@ -13,8 +13,10 @@ from pathlib import Path from typing import ClassVar +from warnings import warn from geoh5py.data import FloatData +from pydantic import model_validator from simpeg_drivers import assets_path from simpeg_drivers.params import BaseForwardOptions, BaseInversionOptions @@ -131,3 +133,15 @@ class MVIInversionOptions(BaseInversionOptions): starting_declination: float | FloatData | None = None reference_inclination: float | FloatData | None = None reference_declination: float | FloatData | None = None + + @model_validator(mode="after") + def validate_lower_bound(self): + if self.lower_bound is not None: + warn( + "Parameter 'lower_bound' for Magnetic Vector Inversion has been deprecated. " + "Defaulting to the negative value of 'upper_bound'.", + DeprecationWarning, + stacklevel=1, + ) + self.lower_bound = None + return self diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py index fa2ff9a5..3d79c44e 100644 --- a/tests/run_tests/driver_mag_test.py +++ b/tests/run_tests/driver_mag_test.py @@ -109,7 +109,6 @@ def test_susceptibility_run( z_norm=1.0, initial_beta_ratio=1e1, gradient_type="components", - lower_bound=0.0, tmi_channel=tmi, tmi_uncertainty=1.0, max_global_iterations=max_iterations, @@ -117,6 +116,7 @@ def test_susceptibility_run( ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") + assert params.lower_bound == 0.0 driver = MagneticInversionDriver.start(str(tmp_path / "Inv_run.ui.json")) with Workspace(driver.params.geoh5.h5file) as run_ws: diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index e40627eb..ba742e87 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -16,6 +16,7 @@ from geoh5py.groups.property_group import GroupTypeEnum from geoh5py.objects import Curve from geoh5py.workspace import Workspace +from pytest import warns from simpeg_drivers.params import ActiveCellsOptions from simpeg_drivers.potential_fields import ( @@ -144,6 +145,63 @@ def test_magnetic_vector_run( assert mesh.property_groups[1].property_group_type == GroupTypeEnum.DIPDIR +def test_magnetic_vector_bounds_run( + tmp_path: Path, + max_iterations=4, + pytest=True, +): + workpath = tmp_path / "inversion_test.ui.geoh5" + if pytest: + workpath = ( + tmp_path.parent + / "test_magnetic_vector_fwr_run0" + / "inversion_test.ui.geoh5" + ) + + with Workspace(workpath) as geoh5: + upper_bound = 1e-2 + tmi = geoh5.get_entity("Iteration_0_tmi")[0] + mesh = geoh5.get_entity("mesh")[0] + topography = geoh5.get_entity("topography")[0] + inducing_field = (50000.0, 90.0, 0.0) + + # Run the inverse + active_cells = ActiveCellsOptions(topography_object=topography) + with warns( + DeprecationWarning, + match="Parameter 'lower_bound' for Magnetic Vector Inversion", + ): + params = MVIInversionOptions( + geoh5=geoh5, + mesh=mesh, + active_cells=active_cells, + inducing_field_strength=inducing_field[0], + inducing_field_inclination=inducing_field[1], + inducing_field_declination=inducing_field[2], + data_object=tmi.parent, + starting_model=1e-4, + reference_model=0.0, + s_norm=0.0, + x_norm=1.0, + y_norm=1.0, + z_norm=1.0, + gradient_type="components", + tmi_channel=tmi, + tmi_uncertainty=4.0, + lower_bound=1e-6, + upper_bound=upper_bound, + max_global_iterations=max_iterations, + initial_beta_ratio=1e1, + store_sensitivities="ram", + save_sensitivities=True, + percentile=100, + ) + params.write_ui_json(path=tmp_path / "Inv_run.ui.json") + + driver = MVIInversionDriver(params) + assert np.all(driver.models.lower_bound == -upper_bound) + + if __name__ == "__main__": # Full run test_magnetic_vector_fwr_run(Path("./"), n_grid_points=20, refinement=(4, 8))