From e66f694ee9c3e01a8684adb6ad1cd1d5e09759e0 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 11 Mar 2025 09:09:21 -0700 Subject: [PATCH 1/8] Use the write at the end of inv. Reformat out reader --- simpeg_drivers/driver.py | 2 +- simpeg_drivers/joint/driver.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/simpeg_drivers/driver.py b/simpeg_drivers/driver.py index 1a01f80c..336d0c6d 100644 --- a/simpeg_drivers/driver.py +++ b/simpeg_drivers/driver.py @@ -384,7 +384,7 @@ def run(self): for directive in self.directives.save_directives: if isinstance(directive, directives.SaveLogFilesGeoH5): - directive.save_log() + directive.write(1) def start_inversion_message(self): # SimPEG reports half phi_d, so we scale to match diff --git a/simpeg_drivers/joint/driver.py b/simpeg_drivers/joint/driver.py index c6233773..133312ae 100644 --- a/simpeg_drivers/joint/driver.py +++ b/simpeg_drivers/joint/driver.py @@ -208,4 +208,4 @@ def _update_log(self): """Update the log with the inversion results.""" for directive in self.directives.directive_list: if isinstance(directive, directives.SaveLogFilesGeoH5): - directive.save_log() + directive.write(1) From a4fed91c74c393d4d2eb8928f922c3f20ae5fa36 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Tue, 11 Mar 2025 09:27:44 -0700 Subject: [PATCH 2/8] Update grav test --- tests/run_tests/driver_grav_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_tests/driver_grav_test.py b/tests/run_tests/driver_grav_test.py index acf942b2..7f0884a4 100644 --- a/tests/run_tests/driver_grav_test.py +++ b/tests/run_tests/driver_grav_test.py @@ -34,7 +34,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.0028055269276044915, "phi_d": 8.315e-05, "phi_m": 0.002882} +target_run = {"data_norm": 0.0028055269276044915, "phi_d": 8.32e-05, "phi_m": 0.00333} def test_gravity_fwr_run( From 4ec0c1c5b5030c33f10db3b6b51687ac7ddfb774 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 12 Mar 2025 15:12:12 -0700 Subject: [PATCH 3/8] Do at least two iterations of mvi to check spherical switch over --- tests/run_tests/driver_mvi_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index ce3a006c..242a754b 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -81,7 +81,7 @@ def test_magnetic_vector_fwr_run( def test_magnetic_vector_run( tmp_path: Path, - max_iterations=1, + max_iterations=2, pytest=True, ): workpath = tmp_path / "inversion_test.ui.geoh5" From a61cb4da9579ef005234ca7784abc287e162744e Mon Sep 17 00:00:00 2001 From: dominiquef Date: Wed, 12 Mar 2025 15:27:52 -0700 Subject: [PATCH 4/8] Update tests --- tests/run_tests/driver_fem_test.py | 2 +- tests/run_tests/driver_mvi_test.py | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index 28a168ff..6fb48988 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -34,7 +34,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 81.8361, "phi_d": 2161, "phi_m": 5828} +target_run = {"data_norm": 81.8361, "phi_d": 2160, "phi_m": 4010} def test_fem_fwr_run( diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index 242a754b..bf33ddfc 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -33,11 +33,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_mvi_run = { - "data_norm": 6.3559205278626525, - "phi_d": 0.01447, - "phi_m": 4.657e-06, -} +target_mvi_run = {"data_norm": 6.3559205278626525, "phi_d": 0.0143, "phi_m": 0.0009} def test_magnetic_vector_fwr_run( @@ -145,8 +141,8 @@ def test_magnetic_vector_run( out_group = run_ws.get_entity("Magnetic Vector Inversion")[0] mesh = out_group.get_entity("mesh")[0] - assert len(mesh.property_groups) == 2 - assert len(mesh.property_groups[0].properties) == 2 + assert len(mesh.property_groups) == 3 + assert len(mesh.property_groups[0].properties) == 3 assert mesh.property_groups[1].property_group_type == GroupTypeEnum.DIPDIR From 4fcfc631f8d673c8ff83e3a35fc8298b63aa7a1f Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 14 Mar 2025 09:04:36 -0700 Subject: [PATCH 5/8] Re-build locks --- .../py-3.10-linux-64-dev.conda.lock.yml | 18 +- environments/py-3.10-linux-64.conda.lock.yml | 10 +- .../py-3.10-win-64-dev.conda.lock.yml | 18 +- environments/py-3.10-win-64.conda.lock.yml | 10 +- .../py-3.11-linux-64-dev.conda.lock.yml | 18 +- environments/py-3.11-linux-64.conda.lock.yml | 10 +- .../py-3.11-win-64-dev.conda.lock.yml | 18 +- environments/py-3.11-win-64.conda.lock.yml | 10 +- .../py-3.12-linux-64-dev.conda.lock.yml | 20 +- environments/py-3.12-linux-64.conda.lock.yml | 12 +- .../py-3.12-win-64-dev.conda.lock.yml | 20 +- environments/py-3.12-win-64.conda.lock.yml | 12 +- py-3.10.conda-lock.yml | 164 ++++++++-------- py-3.11.conda-lock.yml | 164 ++++++++-------- py-3.12.conda-lock.yml | 178 +++++++++--------- 15 files changed, 343 insertions(+), 339 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 a4451708..153179d0 100644 --- a/environments/py-3.10-linux-64-dev.conda.lock.yml +++ b/environments/py-3.10-linux-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py310hff52083_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -57,7 +57,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h89163eb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 - greenlet=3.1.1=py310hf71b8c6_1 @@ -98,7 +98,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -222,7 +222,7 @@ dependencies: - python_abi=3.10=5_cp310 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py310h89163eb_2 - - pyzmq=26.2.1=py310h71f11fc_0 + - pyzmq=26.3.0=py310h71f11fc_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -256,13 +256,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py310ha75aee5_0 + - sqlalchemy=2.0.39=py310ha75aee5_1 - 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 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -295,12 +295,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h5764c6d_0 + - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 32cd4a02..a1caa2a5 100644 --- a/environments/py-3.10-linux-64.conda.lock.yml +++ b/environments/py-3.10-linux-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h89163eb_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310ha2bacc8_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -130,7 +130,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py310ha75aee5_0 @@ -148,12 +148,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h5764c6d_0 + - zstandard=0.23.0=py310ha75aee5_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 eef40e8d..5d613fa0 100644 --- a/environments/py-3.10-win-64-dev.conda.lock.yml +++ b/environments/py-3.10-win-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py310h5588dad_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -57,7 +57,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h38315fa_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 - greenlet=3.1.1=py310h9e98ed7_1 @@ -98,7 +98,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -207,7 +207,7 @@ dependencies: - pywin32=307=py310h9e98ed7_3 - pywinpty=2.0.15=py310h9e98ed7_0 - pyyaml=6.0.2=py310h38315fa_2 - - pyzmq=26.2.1=py310h656833d_0 + - pyzmq=26.3.0=py310h656833d_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -240,13 +240,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py310ha8f682b_0 + - sqlalchemy=2.0.39=py310ha8f682b_1 - 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 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -285,12 +285,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h8d17308_0 + - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 7ccc5e8a..09329be4 100644 --- a/environments/py-3.10-win-64.conda.lock.yml +++ b/environments/py-3.10-win-64.conda.lock.yml @@ -30,7 +30,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py310h38315fa_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py310h3e8ed56_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -113,7 +113,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py310ha8f682b_0 @@ -136,12 +136,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py310h8d17308_0 + - zstandard=0.23.0=py310ha8f682b_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 f5abea3c..49afb7ff 100644 --- a/environments/py-3.11-linux-64-dev.conda.lock.yml +++ b/environments/py-3.11-linux-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py311h38be061_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h2dc5d0c_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 - greenlet=3.1.1=py311hfdbb021_1 @@ -100,7 +100,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -225,7 +225,7 @@ dependencies: - python_abi=3.11=5_cp311 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py311h2dc5d0c_2 - - pyzmq=26.2.1=py311h7deb3e3_0 + - pyzmq=26.3.0=py311h7deb3e3_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -259,13 +259,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py311h9ecbd09_0 + - sqlalchemy=2.0.39=py311h9ecbd09_1 - 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 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -299,12 +299,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311hd4cff14_0 + - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 fd64a60a..1f65072d 100644 --- a/environments/py-3.11-linux-64.conda.lock.yml +++ b/environments/py-3.11-linux-64.conda.lock.yml @@ -32,7 +32,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h2dc5d0c_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h5b7b71f_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -132,7 +132,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py311h9ecbd09_0 @@ -151,12 +151,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311hd4cff14_0 + - zstandard=0.23.0=py311h9ecbd09_1 - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 a711fd79..466633b3 100644 --- a/environments/py-3.11-win-64-dev.conda.lock.yml +++ b/environments/py-3.11-win-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py311h1ea47a8_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h5082efb_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 - greenlet=3.1.1=py311hda3d55a_1 @@ -100,7 +100,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -210,7 +210,7 @@ dependencies: - pywin32=307=py311hda3d55a_3 - pywinpty=2.0.15=py311hda3d55a_0 - pyyaml=6.0.2=py311h5082efb_2 - - pyzmq=26.2.1=py311h484c95c_0 + - pyzmq=26.3.0=py311h484c95c_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -243,13 +243,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py311he736701_0 + - sqlalchemy=2.0.39=py311he736701_1 - 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 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -289,12 +289,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311ha68e1ae_0 + - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 99a2e838..72bd3a27 100644 --- a/environments/py-3.11-win-64.conda.lock.yml +++ b/environments/py-3.11-win-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py311h5082efb_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py311h9b10771_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -115,7 +115,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py311he736701_0 @@ -139,12 +139,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.19.0=py311ha68e1ae_0 + - zstandard=0.23.0=py311he736701_1 - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 880f8814..ebad1a89 100644 --- a/environments/py-3.12-linux-64-dev.conda.lock.yml +++ b/environments/py-3.12-linux-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py312h7900ff3_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h178313f_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 - greenlet=3.1.1=py312h2ec8cdc_1 @@ -100,7 +100,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -225,7 +225,7 @@ dependencies: - python_abi=3.12=5_cp312 - pytz=2024.1=pyhd8ed1ab_0 - pyyaml=6.0.2=py312h178313f_2 - - pyzmq=26.2.1=py312hbf22597_0 + - pyzmq=26.3.0=py312hbf22597_0 - readline=8.2=h8c095d6_2 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 @@ -259,13 +259,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py312h66e93f0_0 + - sqlalchemy=2.0.39=py312h66e93f0_1 - 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 - terminado=0.18.1=pyh0d859eb_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=noxft_h4845f30_101 - toml=0.10.2=pyhd8ed1ab_1 @@ -299,12 +299,12 @@ dependencies: - zeromq=4.3.5=h3b0a872_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312hef9b889_1 - - zstd=1.5.6=ha6fb4c9_0 + - zstandard=0.23.0=py312h66e93f0_1 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 396ce581..ee372f66 100644 --- a/environments/py-3.12-linux-64.conda.lock.yml +++ b/environments/py-3.12-linux-64.conda.lock.yml @@ -32,7 +32,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h178313f_0 - - freetype=2.12.1=h267a509_2 + - freetype=2.13.3=h48d6fc4_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hc39e661_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -132,7 +132,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=hceb3a55_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=noxft_h4845f30_101 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py312h66e93f0_0 @@ -151,12 +151,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312hef9b889_1 - - zstd=1.5.6=ha6fb4c9_0 + - zstandard=0.23.0=py312h66e93f0_1 + - zstd=1.5.7=hb8e6e7a_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 13bbcdbb..7ddcb8ee 100644 --- a/environments/py-3.12-win-64-dev.conda.lock.yml +++ b/environments/py-3.12-win-64-dev.conda.lock.yml @@ -18,7 +18,7 @@ dependencies: - astroid=3.3.9=py312h2e8e312_0 - asttokens=3.0.0=pyhd8ed1ab_1 - async-lru=2.0.4=pyhd8ed1ab_1 - - attrs=25.1.0=pyh71513ae_0 + - attrs=25.3.0=pyh71513ae_0 - babel=2.17.0=pyhd8ed1ab_0 - beautifulsoup4=4.13.3=pyha770c72_0 - bleach=6.2.0=pyh29332c3_4 @@ -58,7 +58,7 @@ dependencies: - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h31fea79_0 - fqdn=1.5.1=pyhd8ed1ab_1 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 - greenlet=3.1.1=py312h275cf98_1 @@ -100,7 +100,7 @@ dependencies: - jupyter_events=0.12.0=pyh29332c3_0 - jupyter_server=2.15.0=pyhd8ed1ab_0 - jupyter_server_terminals=0.5.3=pyhd8ed1ab_1 - - jupyterlab=4.3.5=pyhd8ed1ab_0 + - jupyterlab=4.3.6=pyhd8ed1ab_0 - jupyterlab_pygments=0.3.0=pyhd8ed1ab_2 - jupyterlab_server=2.27.3=pyhd8ed1ab_1 - jupyterlab_widgets=1.1.11=pyhd8ed1ab_0 @@ -210,7 +210,7 @@ dependencies: - pywin32=307=py312h275cf98_3 - pywinpty=2.0.15=py312h275cf98_0 - pyyaml=6.0.2=py312h31fea79_2 - - pyzmq=26.2.1=py312hd7027bb_0 + - pyzmq=26.3.0=py312hd7027bb_0 - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1 - referencing=0.36.2=pyh29332c3_0 - requests=2.32.3=pyhd8ed1ab_1 @@ -243,13 +243,13 @@ dependencies: - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1 - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1 - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1 - - sqlalchemy=2.0.38=py312h4389bb4_0 + - sqlalchemy=2.0.39=py312h4389bb4_1 - 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 - terminado=0.18.1=pyh5737063_0 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tinycss2=1.4.0=pyhd8ed1ab_0 - tk=8.6.13=h5226925_1 - toml=0.10.2=pyhd8ed1ab_1 @@ -289,12 +289,12 @@ dependencies: - zeromq=4.3.5=ha9f60a1_7 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312h7606c53_1 - - zstd=1.5.6=h0ea2cb4_0 + - zstandard=0.23.0=py312h4389bb4_1 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 a938bc73..fa9ce727 100644 --- a/environments/py-3.12-win-64.conda.lock.yml +++ b/environments/py-3.12-win-64.conda.lock.yml @@ -31,7 +31,7 @@ dependencies: - distributed=2024.6.2=pyhd8ed1ab_0 - fasteners=0.19=pyhd8ed1ab_1 - fonttools=4.56.0=py312h31fea79_0 - - freetype=2.12.1=hdaf720e_2 + - freetype=2.13.3=h0b5ce68_0 - fsspec=2025.3.0=pyhd8ed1ab_0 - geoana=0.7.2=py312hbaa7e33_0 - h2=4.2.0=pyhd8ed1ab_0 @@ -115,7 +115,7 @@ dependencies: - sortedcontainers=2.4.0=pyhd8ed1ab_1 - tbb=2021.13.0=h62715c5_1 - tblib=3.0.0=pyhd8ed1ab_1 - - threadpoolctl=3.5.0=pyhc1e730c_0 + - threadpoolctl=3.6.0=pyhecae5ae_0 - tk=8.6.13=h5226925_1 - toolz=1.0.0=pyhd8ed1ab_1 - tornado=6.4.2=py312h4389bb4_0 @@ -139,12 +139,12 @@ dependencies: - zarr=2.14.2=pyhd8ed1ab_0 - zict=3.0.0=pyhd8ed1ab_1 - zipp=3.21.0=pyhd8ed1ab_1 - - zstandard=0.23.0=py312h7606c53_1 - - zstd=1.5.6=h0ea2cb4_0 + - zstandard=0.23.0=py312h4389bb4_1 + - zstd=1.5.7=hbeecb71_1 - pip: - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@1ed273892ca0494a3b612d075a66dd4a1de2283a - - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 - - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 + - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 - 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 472eeecf..1f2f5f5d 100644 --- a/py-3.10.conda-lock.yml +++ b/py-3.10.conda-lock.yml @@ -354,27 +354,27 @@ package: category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -1473,33 +1473,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.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/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2777,7 +2778,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2797,14 +2798,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2824,10 +2825,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -6231,7 +6232,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6242,14 +6243,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py310h71f11fc_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py310h71f11fc_0.conda hash: - md5: 7793fb5339be966e5f28971fd6025a9e - sha256: fb5446c23c920970502e4288ee5a8c2b6a52c8c6761673716d7243f7feedf065 + md5: 930d3ad098bb986315a2f95814c5cf42 + sha256: 25c88b22d72a134793d3e294ec1398279cb5eab420d803a3c32e29e1831b2a56 category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6260,10 +6261,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py310h656833d_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py310h656833d_0.conda hash: - md5: a32255b1e5bf69adf98b943fba791bc0 - sha256: 992e8813a540770e096d0bcfdd6152f7e57a8a2632957cdd3ec2f4609afd1e21 + md5: 1cc6a656b0b843d8988c4ed20d4d6c89 + sha256: 93687d8a698481e222abc30daa6d66d03ca0f10e32a7143629ad3a7b5d4244e7 category: dev optional: true - name: readline @@ -7198,7 +7199,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7208,14 +7209,14 @@ package: python: '>=3.10,<3.11.0a0' python_abi: 3.10.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py310ha75aee5_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py310ha75aee5_1.conda hash: - md5: 11bb9ab95d526337cb9672fe69209b29 - sha256: dda13ac7d41dadc8b5e55dc94772a24543190baebffd5fc228515d55ea1cb48b + md5: ec8f30932c8dcd1923873941c3f43322 + sha256: 267e69d64d7f1967b6c9e02ecfeb0503d5caf5b6297ba3609a7d576de06adf3e category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7226,10 +7227,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py310ha8f682b_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py310ha8f682b_1.conda hash: - md5: 86e42a739127af88d432ab49ae4778c3 - sha256: 84d82e16819e450f3b875461b8430f4433a9f6ab2143e43a018da382913acaf2 + md5: 7ef7d2d6a1e6a36dcd00e6ca06d97105 + sha256: e1b2a6dd6f900be3f73b35089382bf2e4eaa835700eff0e697c3c2eb1c55843f category: dev optional: true - name: stack_data @@ -7371,27 +7372,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8286,35 +8287,36 @@ package: category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: linux-64 dependencies: - cffi: '>=1.8' - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + cffi: '>=1.11' + libgcc: '>=13' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py310h5764c6d_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py310ha75aee5_1.conda hash: - md5: 74ea667169b1296fb31bb86f13abfa49 - sha256: 958e22d2b24204e08ca0d64db55d63520583db99852cecc82d22c1a3832b23a2 + md5: 0316e8d0e00c00631a6de89207db5b09 + sha256: 96f96336f76443f5efb05f8a7232cc62f8fff969c27d03aa4aae181745f6f961 category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: win-64 dependencies: - cffi: '>=1.8' + cffi: '>=1.11' python: '>=3.10,<3.11.0a0' python_abi: 3.10.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.19.0-py310h8d17308_0.tar.bz2 + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py310ha8f682b_1.conda hash: - md5: b0e5d4dbfffc73a86395f74959570006 - sha256: a528d70c08d22edb14358de8952e44a1ce04b5cf30fea424bf539f64c71964f3 + md5: 831d9f1bfdfc3616b4c0f91cdb36ed38 + sha256: 6bc275161380985ba7effabf53534e8b97479d0318329f345b2e936bd2e4dbe6 category: main optional: false - name: zstd @@ -8390,12 +8392,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: geoh5py @@ -8407,16 +8409,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@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8428,16 +8430,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8449,12 +8451,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app diff --git a/py-3.11.conda-lock.yml b/py-3.11.conda-lock.yml index 3177ff5e..cdc2c60c 100644 --- a/py-3.11.conda-lock.yml +++ b/py-3.11.conda-lock.yml @@ -352,27 +352,27 @@ package: category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -1497,33 +1497,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.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/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2829,7 +2830,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2849,14 +2850,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2876,10 +2877,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -6314,7 +6315,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6325,14 +6326,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py311h7deb3e3_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py311h7deb3e3_0.conda hash: - md5: 52457fbaa0aef8136d5dd7bb8a36db9e - sha256: bd6309ef4629744aaaccd9b33d6389dfe879e9864386137e6e4ecc7e1b9ed0f3 + md5: 1ca9cbd0e1d3db5f4fda183977c8ae01 + sha256: a53a33de9f4dab1a3129324b4b4e7da2c6c642d8555fe591d3f6bc9772054389 category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6343,10 +6344,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py311h484c95c_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py311h484c95c_0.conda hash: - md5: efe5e2d7ca651116dd17052ac4891746 - sha256: 1b102e3e6c8b5632c9e7b292c8fe4f06c761bffeee39389ec337d83a3388b6f0 + md5: e01cddfa1ebe1376589fa2f331030744 + sha256: 38fea35b67252e56e308f1af6e7694a414ff5e7d55d74cbcfb22a5b9aa344d9f category: dev optional: true - name: readline @@ -7281,7 +7282,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7291,14 +7292,14 @@ package: python: '>=3.11,<3.12.0a0' python_abi: 3.11.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py311h9ecbd09_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py311h9ecbd09_1.conda hash: - md5: abf26162851979957e29e2952b8a62d9 - sha256: ccfbba7080e7ce9d07eee8862c5c81f886b6496f96197cabdeb76e2523f56930 + md5: 6b5eb445386814e5cfb622030862e3bf + sha256: ff0fa5333e20a80fcba67eac2118ecbad29a5dc4bb3867110e5702c804800b82 category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7309,10 +7310,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py311he736701_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py311he736701_1.conda hash: - md5: 2376fff5037b991ef237a01b9c048f5a - sha256: 56515b53b4a641fce8364197460fb1b7dfe5c46aa5e3b8d285c7985b714bacb0 + md5: 48e9ba64e13402865f307b79a408e14f + sha256: 224bdac0c4a332d4dc16f194737d277063f5cec44f855015ae02edd2c71c9da4 category: dev optional: true - name: stack_data @@ -7454,27 +7455,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8400,35 +8401,36 @@ package: category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: linux-64 dependencies: - cffi: '>=1.8' - libgcc-ng: '>=12' + __glibc: '>=2.17,<3.0.a0' + cffi: '>=1.11' + libgcc: '>=13' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.19.0-py311hd4cff14_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py311h9ecbd09_1.conda hash: - md5: 056b3271f46abaa4673c8c6783283a07 - sha256: 8aac43cc4fbdcc420fe8a22c764b67f6ac9168b103bfd10d79a82b748304ddf6 + md5: 6d229edd907b6bb39961b74e3d52de9c + sha256: 1a824220227f356f35acec5ff6a4418b1ccd0238fd752ceebeb04a0bd37acf0f category: main optional: false - name: zstandard - version: 0.19.0 + version: 0.23.0 manager: conda platform: win-64 dependencies: - cffi: '>=1.8' + cffi: '>=1.11' python: '>=3.11,<3.12.0a0' python_abi: 3.11.* ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' - vs2015_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.19.0-py311ha68e1ae_0.tar.bz2 + vc14_runtime: '>=14.29.30139' + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py311he736701_1.conda hash: - md5: 94114ffe0cad9e1e704e2c0015c8aa87 - sha256: c687a7d884e98c69f4f1fee8cb9949157bba7c76a54176edeb3262c156e08e71 + md5: a4c147aaaf7e284762d7a6acc49e35e5 + sha256: 78afa8ce76763993a76da1b0120b690cba8926271cc9e0462f66155866817c84 category: main optional: false - name: zstd @@ -8504,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: geoh5py @@ -8521,16 +8523,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@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8542,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8563,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app diff --git a/py-3.12.conda-lock.yml b/py-3.12.conda-lock.yml index 6f80616b..aeb2f92d 100644 --- a/py-3.12.conda-lock.yml +++ b/py-3.12.conda-lock.yml @@ -352,27 +352,27 @@ package: category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: linux-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: attrs - version: 25.1.0 + version: 25.3.0 manager: conda platform: win-64 dependencies: python: '>=3.9' - url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.1.0-pyh71513ae_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/attrs-25.3.0-pyh71513ae_0.conda hash: - md5: 2cc3f588512f04f3a0c64b4e9bedc02d - sha256: 1f267886522dfb9ae4e5ebbc3135b5eb13cff27bdbfe8d881a4d893459166ab4 + md5: a10d11958cadc13fdb43df75f8b1903f + sha256: 99c53ffbcb5dc58084faf18587b215f9ac8ced36bbfb55fa807c00967e419019 category: dev optional: true - name: babel @@ -1497,33 +1497,34 @@ package: category: dev optional: true - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.12.1-h267a509_2.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libpng: '>=1.6.47,<1.7.0a0' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/freetype-2.13.3-h48d6fc4_0.conda hash: - md5: 9ae35c3d96db2c94ce0cef86efdfa2cb - sha256: b2e3c449ec9d907dd4656cb0dc93e140f447175b125a3824b31368b06c666bb6 + md5: 9ecfd6f2ca17077dd9c2d24770bb9ccd + sha256: 7385577509a9c4730130f54bb6841b9b416249d5f4e9f74bf313e6378e313c57 category: main optional: false - name: freetype - version: 2.12.1 + version: 2.13.3 manager: conda platform: win-64 dependencies: - libpng: '>=1.6.39,<1.7.0a0' - libzlib: '>=1.2.13,<2.0.0a0' + libpng: '>=1.6.47,<1.7.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/freetype-2.12.1-hdaf720e_2.conda + url: https://conda.anaconda.org/conda-forge/win-64/freetype-2.13.3-h0b5ce68_0.conda hash: - md5: 3761b23693f768dc75a8fd0a73ca053f - sha256: 2c53ee8879e05e149a9e525481d36adfd660a6abda26fd731376fa64ff03e728 + md5: 9c461ed7b07fb360d2c8cfe726c7d521 + sha256: 67e3af0fbe6c25f5ab1af9a3d3000464c5e88a8a0b4b06602f4a5243a8a1fd42 category: main optional: false - name: fsspec @@ -2829,7 +2830,7 @@ package: category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: linux-64 dependencies: @@ -2849,14 +2850,14 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab - version: 4.3.5 + version: 4.3.6 manager: conda platform: win-64 dependencies: @@ -2876,10 +2877,10 @@ package: tomli: '>=1.2.2' tornado: '>=6.2.0' traitlets: '' - url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.5-pyhd8ed1ab_0.conda + url: https://conda.anaconda.org/conda-forge/noarch/jupyterlab-4.3.6-pyhd8ed1ab_0.conda hash: - md5: ec1f95d39ec862a7a87de0662a98ce3e - sha256: 9d033314060993522e1ad999ded9da316a8b928d11b7a58c254597382239a72e + md5: 8b91a10c966aa65b9ad1a2702e6ef121 + sha256: cf10c9b4158c4ef2796fde546f2bbe45f43c1402a0c2a175939ebbb308846ada category: dev optional: true - name: jupyterlab_pygments @@ -6314,7 +6315,7 @@ package: category: main optional: false - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: linux-64 dependencies: @@ -6325,14 +6326,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* zeromq: '>=4.3.5,<4.4.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.2.1-py312hbf22597_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/pyzmq-26.3.0-py312hbf22597_0.conda hash: - md5: 7cec8d0dac15a2d9fea8e49879aa779d - sha256: 90ec0da0317d3d76990a40c61e1709ef859dd3d8c63838bad2814f46a63c8a2e + md5: ec243006dd2b7dc72f1fba385e59f693 + sha256: aa96b9d13bc74f514ccbc3ad275d23bb837ec63894e6e7fb43786c7c41959bfd category: dev optional: true - name: pyzmq - version: 26.2.1 + version: 26.3.0 manager: conda platform: win-64 dependencies: @@ -6343,10 +6344,10 @@ package: vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' zeromq: '>=4.3.5,<4.3.6.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.2.1-py312hd7027bb_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/pyzmq-26.3.0-py312hd7027bb_0.conda hash: - md5: e2ae9a063922c1798908cce9961a86fb - sha256: 9a139a04873a53eefb7b39d3b9f04ae99ab8079b68a80b3caaa310d93483e6ff + md5: 5795400c7af6fcc8dc30b72e77e52dca + sha256: 39e0fb384a516bbff9ee0ffdfbb765d0ee1180ad5d6cbdcf75140fe871b4f615 category: dev optional: true - name: readline @@ -7281,7 +7282,7 @@ package: category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: linux-64 dependencies: @@ -7291,14 +7292,14 @@ package: python: '>=3.12,<3.13.0a0' python_abi: 3.12.* typing-extensions: '>=4.6.0' - url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.38-py312h66e93f0_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/sqlalchemy-2.0.39-py312h66e93f0_1.conda hash: - md5: 91e345de80d0dc238b598683b69da123 - sha256: e70d630452e3b44f0c4c127a73df3c90bfae125fc53f9c698954058153b18aa1 + md5: 09253e9e1a2c2003b3c42ac11143e05a + sha256: 1ba23a1da71a5883c8fce94662e5468ceee6d784a899fb12315dfcfdd3adb7ba category: dev optional: true - name: sqlalchemy - version: 2.0.38 + version: 2.0.39 manager: conda platform: win-64 dependencies: @@ -7309,10 +7310,10 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.38-py312h4389bb4_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/sqlalchemy-2.0.39-py312h4389bb4_1.conda hash: - md5: 42fb97584c9d1d6c5d423a1e38374d04 - sha256: 6d4d128c46c891224690a24d1453de720de5435f9d60ad136614d75a56652144 + md5: caddc19808c2f26047a23c9ef0d8ca30 + sha256: 9a118904819142a635db24908a80b44406e2269f768fc1c67b14f6a1348fdada category: dev optional: true - name: stack_data @@ -7454,27 +7455,27 @@ package: category: dev optional: true - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: linux-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: threadpoolctl - version: 3.5.0 + version: 3.6.0 manager: conda platform: win-64 dependencies: - python: '>=3.8' - url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.5.0-pyhc1e730c_0.conda + python: '>=3.9' + url: https://conda.anaconda.org/conda-forge/noarch/threadpoolctl-3.6.0-pyhecae5ae_0.conda hash: - md5: df68d78237980a159bd7149f33c0e8fd - sha256: 45e402941f6bed094022c5726a2ca494e6224b85180d2367fb6ddd9aea68079d + md5: 9d64911b31d57ca443e9f1e36b04385f + sha256: 6016672e0e72c4cf23c0cf7b1986283bd86a9c17e8d319212d78d8e9ae42fdfd category: main optional: false - name: tinycss2 @@ -8409,11 +8410,10 @@ package: libgcc: '>=13' python: '>=3.12,<3.13.0a0' python_abi: 3.12.* - zstd: '>=1.5.6,<1.5.7.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py312hef9b889_1.conda + url: https://conda.anaconda.org/conda-forge/linux-64/zstandard-0.23.0-py312h66e93f0_1.conda hash: - md5: 8b7069e9792ee4e5b4919a7a306d2e67 - sha256: b97015e146437283f2213ff0e95abdc8e2480150634d81fbae6b96ee09f5e50b + md5: d28b82fcc8d1b462b595af4b15a6cdcf + sha256: b4fd6bd1cb87a183a8bbe85b4e87a1e7c51473309d0d82cd88d38fb021bcf41e category: main optional: false - name: zstandard @@ -8427,40 +8427,40 @@ package: ucrt: '>=10.0.20348.0' vc: '>=14.2,<15' vc14_runtime: '>=14.29.30139' - zstd: '>=1.5.6,<1.5.7.0a0' - url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py312h7606c53_1.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstandard-0.23.0-py312h4389bb4_1.conda hash: - md5: a92cc3435b2fd6f51463f5a4db5c50b1 - sha256: 3e0c718aa18dcac7f080844dbe0aea41a9cea75083019ce02e8a784926239826 + md5: 5028543ffb67666ca4fc3ebd620c97b8 + sha256: 17f2abbda821be146b549498fab3d0eb9cafb210e163b983524db91524b8dcb5 category: main optional: false - name: zstd - version: 1.5.6 + version: 1.5.7 manager: conda platform: linux-64 dependencies: - libgcc-ng: '>=12' - libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<2.0.0a0' - url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.6-ha6fb4c9_0.conda + __glibc: '>=2.17,<3.0.a0' + libgcc: '>=13' + libstdcxx: '>=13' + libzlib: '>=1.3.1,<2.0a0' + url: https://conda.anaconda.org/conda-forge/linux-64/zstd-1.5.7-hb8e6e7a_1.conda hash: - md5: 4d056880988120e29d75bfff282e0f45 - sha256: c558b9cc01d9c1444031bd1ce4b9cff86f9085765f17627a6cd85fc623c8a02b + md5: 02e4e2fa41a6528afba2e54cbc4280ff + sha256: 532d3623961e34c53aba98db2ad0a33b7a52ff90d6960e505fb2d2efc06bb7da category: main optional: false - name: zstd - version: 1.5.6 + version: 1.5.7 manager: conda platform: win-64 dependencies: - libzlib: '>=1.2.13,<2.0.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/zstd-1.5.6-h0ea2cb4_0.conda + url: https://conda.anaconda.org/conda-forge/win-64/zstd-1.5.7-hbeecb71_1.conda hash: - md5: 9a17230f95733c04dc40a2b1e5491d74 - sha256: 768e30dc513568491818fb068ee867c57c514b553915536da09e5d10b4ebf3c3 + md5: bf190adcc22f146d8ec66da215c9d78b + sha256: a59b096b95f20910158c927797e9144ed9c7970f1b4aca58e6d6c8db9f653006 category: main optional: false - name: geoapps-utils @@ -8506,12 +8506,12 @@ package: numpy: '>=1.26.0,<1.27.0' pillow: '>=10.3.0,<10.4.0' pydantic: '>=2.5.2,<3.0.0' - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: geoh5py @@ -8523,16 +8523,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@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 hash: - sha256: fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + sha256: 402aac24290356fd69dd3b9d762607c05b548b78 source: type: url - url: git+https://github.com/MiraGeoscience/geoh5py.git@fcd14f4a511583b410f91c3d8e97be1fc755bdb5 + url: git+https://github.com/MiraGeoscience/geoh5py.git@402aac24290356fd69dd3b9d762607c05b548b78 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: linux-64 dependencies: @@ -8544,16 +8544,16 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: mira-simpeg - version: 0.23.0.1a1.dev12+g826b68606 + version: 0.23.0.1a1.dev21+g79ba55ab3 manager: pip platform: win-64 dependencies: @@ -8565,12 +8565,12 @@ package: numpy: '>=1.22' pymatsolver: '>=0.3' scipy: '>=1.8' - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 hash: - sha256: 826b686061e177b769838290bdfb0a70d1884b1c + sha256: 79ba55ab38d5cab6d8292c3dd904fbd043f26da9 source: type: url - url: git+https://github.com/MiraGeoscience/simpeg.git@826b686061e177b769838290bdfb0a70d1884b1c + url: git+https://github.com/MiraGeoscience/simpeg.git@79ba55ab38d5cab6d8292c3dd904fbd043f26da9 category: main optional: false - name: octree-creation-app From 7d4744b3d20591bd013f60646dabc37463105c06 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 14 Mar 2025 09:47:05 -0700 Subject: [PATCH 6/8] Update targets and squeeze tolerance --- simpeg_drivers/utils/testing.py | 2 +- tests/run_tests/driver_airborne_tem_test.py | 4 ++-- tests/run_tests/driver_dc_2d_test.py | 4 ++-- tests/run_tests/driver_dc_test.py | 2 +- tests/run_tests/driver_fem_test.py | 2 +- tests/run_tests/driver_ground_tem_test.py | 4 ++-- tests/run_tests/driver_ip_2d_test.py | 2 +- tests/run_tests/driver_ip_b2d_test.py | 2 +- tests/run_tests/driver_ip_test.py | 2 +- tests/run_tests/driver_joint_cross_gradient_test.py | 2 +- tests/run_tests/driver_joint_surveys_test.py | 2 +- tests/run_tests/driver_mag_test.py | 2 +- tests/run_tests/driver_mt_test.py | 4 ++-- tests/run_tests/driver_mvi_test.py | 3 +-- tests/run_tests/driver_tipper_test.py | 4 ++-- 15 files changed, 20 insertions(+), 21 deletions(-) diff --git a/simpeg_drivers/utils/testing.py b/simpeg_drivers/utils/testing.py index 47445b12..8b203a2c 100644 --- a/simpeg_drivers/utils/testing.py +++ b/simpeg_drivers/utils/testing.py @@ -78,7 +78,7 @@ def make(self): return self.ws -def check_target(output: dict, target: dict, tolerance=0.1): +def check_target(output: dict, target: dict, tolerance=0.05): """ Check inversion output metrics against hard-valued target. :param output: Dictionary containing keys for 'data', 'phi_d' and 'phi_m'. diff --git a/tests/run_tests/driver_airborne_tem_test.py b/tests/run_tests/driver_airborne_tem_test.py index 27122067..230d76da 100644 --- a/tests/run_tests/driver_airborne_tem_test.py +++ b/tests/run_tests/driver_airborne_tem_test.py @@ -32,7 +32,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 7.05481e-08, "phi_d": 198200000, "phi_m": 7806} +target_run = {"data_norm": 7.05481e-08, "phi_d": 198000000, "phi_m": 7540} def test_bad_waveform(tmp_path: Path): @@ -199,7 +199,7 @@ def test_airborne_tem_run(tmp_path: Path, max_iterations=1, pytest=True): ) output["data"] = orig_dBzdt if pytest: - check_target(output, target_run, tolerance=0.1) + check_target(output, target_run) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind) diff --git a/tests/run_tests/driver_dc_2d_test.py b/tests/run_tests/driver_dc_2d_test.py index 4e59c304..f4f0b71a 100644 --- a/tests/run_tests/driver_dc_2d_test.py +++ b/tests/run_tests/driver_dc_2d_test.py @@ -36,8 +36,8 @@ target_run = { "data_norm": 0.59563, - "phi_d": 2814, - "phi_m": 15.88, + "phi_d": 2820, + "phi_m": 16.8, } diff --git a/tests/run_tests/driver_dc_test.py b/tests/run_tests/driver_dc_test.py index e5cb8add..1fa04a7b 100644 --- a/tests/run_tests/driver_dc_test.py +++ b/tests/run_tests/driver_dc_test.py @@ -31,7 +31,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.150326, "phi_d": 194.2, "phi_m": 346.2} +target_run = {"data_norm": 0.150326, "phi_d": 212, "phi_m": 374} def test_dc_3d_fwr_run( diff --git a/tests/run_tests/driver_fem_test.py b/tests/run_tests/driver_fem_test.py index 6fb48988..a31a6f20 100644 --- a/tests/run_tests/driver_fem_test.py +++ b/tests/run_tests/driver_fem_test.py @@ -165,7 +165,7 @@ def test_fem_run(tmp_path: Path, max_iterations=1, pytest=True): ) if pytest: - check_target(output, target_run, tolerance=0.1) + check_target(output, target_run) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind) diff --git a/tests/run_tests/driver_ground_tem_test.py b/tests/run_tests/driver_ground_tem_test.py index 6472e090..b628ede3 100644 --- a/tests/run_tests/driver_ground_tem_test.py +++ b/tests/run_tests/driver_ground_tem_test.py @@ -36,7 +36,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 8.806897e-07, "phi_d": 152.8, "phi_m": 12850} +target_run = {"data_norm": 8.806897e-07, "phi_d": 153, "phi_m": 13100} def test_tiling_ground_tem( @@ -230,7 +230,7 @@ def test_ground_tem_run(tmp_path: Path, max_iterations=1, pytest=True): assert driver.inversion_data.entity.tx_id_property.name == "tx_id" output["data"] = orig_dBzdt if pytest: - check_target(output, target_run, tolerance=0.1) + check_target(output, target_run) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind) diff --git a/tests/run_tests/driver_ip_2d_test.py b/tests/run_tests/driver_ip_2d_test.py index 0aed0373..6a0f6618 100644 --- a/tests/run_tests/driver_ip_2d_test.py +++ b/tests/run_tests/driver_ip_2d_test.py @@ -32,7 +32,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.09052544, "phi_d": 24910, "phi_m": 0.1845} +target_run = {"data_norm": 0.09052544, "phi_d": 24900, "phi_m": 0.185} def test_ip_2d_fwr_run( diff --git a/tests/run_tests/driver_ip_b2d_test.py b/tests/run_tests/driver_ip_b2d_test.py index 9533f3f1..2b45f5d1 100644 --- a/tests/run_tests/driver_ip_b2d_test.py +++ b/tests/run_tests/driver_ip_b2d_test.py @@ -37,7 +37,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.0919313, "phi_d": 25480, "phi_m": 0.2008} +target_run = {"data_norm": 0.0919313, "phi_d": 25600, "phi_m": 0.201} def test_ip_p3d_fwr_run( diff --git a/tests/run_tests/driver_ip_test.py b/tests/run_tests/driver_ip_test.py index 5c67bae2..057f36d7 100644 --- a/tests/run_tests/driver_ip_test.py +++ b/tests/run_tests/driver_ip_test.py @@ -30,7 +30,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.0082997, "phi_d": 180.9, "phi_m": 0.6749} +target_run = {"data_norm": 0.0082997, "phi_d": 178, "phi_m": 0.684} def test_ip_3d_fwr_run( diff --git a/tests/run_tests/driver_joint_cross_gradient_test.py b/tests/run_tests/driver_joint_cross_gradient_test.py index 0089bc46..3bc54c1a 100644 --- a/tests/run_tests/driver_joint_cross_gradient_test.py +++ b/tests/run_tests/driver_joint_cross_gradient_test.py @@ -47,7 +47,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 53.29601, "phi_d": 10590, "phi_m": 0.1336} +target_run = {"data_norm": 53.29601, "phi_d": 10200, "phi_m": 0.123} def test_joint_cross_gradient_fwr_run( diff --git a/tests/run_tests/driver_joint_surveys_test.py b/tests/run_tests/driver_joint_surveys_test.py index b685efc6..4dc5b757 100644 --- a/tests/run_tests/driver_joint_surveys_test.py +++ b/tests/run_tests/driver_joint_surveys_test.py @@ -29,7 +29,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.2997791602206556, "phi_d": 1411, "phi_m": 74.54} +target_run = {"data_norm": 0.2997791602206556, "phi_d": 1410, "phi_m": 74.4} def test_joint_surveys_fwr_run( diff --git a/tests/run_tests/driver_mag_test.py b/tests/run_tests/driver_mag_test.py index 42ece601..fa2ff9a5 100644 --- a/tests/run_tests/driver_mag_test.py +++ b/tests/run_tests/driver_mag_test.py @@ -32,7 +32,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 8.71227951689941, "phi_d": 37.52, "phi_m": 5.717e-06} +target_run = {"data_norm": 8.71227951689941, "phi_d": 37.5, "phi_m": 5.72e-06} def test_susceptibility_fwr_run( diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 008aac41..61a67f05 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -34,7 +34,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.032649770, "phi_d": 6.676, "phi_m": 212.3} +target_run = {"data_norm": 0.032649770, "phi_d": 6.68, "phi_m": 263} def test_magnetotellurics_fwr_run( @@ -177,7 +177,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): ) output["data"] = orig_zyy_real_1 if pytest: - check_target(output, target_run, tolerance=0.5) + check_target(output, target_run) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind) diff --git a/tests/run_tests/driver_mvi_test.py b/tests/run_tests/driver_mvi_test.py index bf33ddfc..6839b44d 100644 --- a/tests/run_tests/driver_mvi_test.py +++ b/tests/run_tests/driver_mvi_test.py @@ -112,7 +112,6 @@ def test_magnetic_vector_run( y_norm=1.0, z_norm=1.0, gradient_type="components", - tmi_channel_bool=True, tmi_channel=tmi, tmi_uncertainty=4.0, max_global_iterations=max_iterations, @@ -142,7 +141,7 @@ def test_magnetic_vector_run( out_group = run_ws.get_entity("Magnetic Vector Inversion")[0] mesh = out_group.get_entity("mesh")[0] assert len(mesh.property_groups) == 3 - assert len(mesh.property_groups[0].properties) == 3 + assert len(mesh.property_groups[0].properties) == 2 assert mesh.property_groups[1].property_group_type == GroupTypeEnum.DIPDIR diff --git a/tests/run_tests/driver_tipper_test.py b/tests/run_tests/driver_tipper_test.py index eea6f237..7a3fccbb 100644 --- a/tests/run_tests/driver_tipper_test.py +++ b/tests/run_tests/driver_tipper_test.py @@ -32,7 +32,7 @@ # To test the full run and validate the inversion. # Move this file out of the test directory and run. -target_run = {"data_norm": 0.006549595043425509, "phi_d": 221.4, "phi_m": 270.5} +target_run = {"data_norm": 0.006549595043425509, "phi_d": 223, "phi_m": 255} def test_tipper_fwr_run( @@ -166,7 +166,7 @@ def test_tipper_run(tmp_path: Path, max_iterations=1, pytest=True): ) output["data"] = orig_tyz_real_1 if pytest: - check_target(output, target_run, tolerance=0.1) + check_target(output, target_run) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind) From 6db4b52f772e4d63791f6e3188b3411fa5004758 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 14 Mar 2025 12:29:44 -0700 Subject: [PATCH 7/8] Try using Mumps solver for MT failure on Windows tests --- tests/run_tests/driver_mt_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 61a67f05..1bbe8346 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -71,6 +71,7 @@ def test_magnetotellurics_fwr_run( zyx_imag_channel_bool=True, zyy_real_channel_bool=True, zyy_imag_channel_bool=True, + solver_type="Mumps", ) fwr_driver = MTForwardDriver(params) @@ -166,6 +167,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): sens_wts_threshold=1.0, prctile=100, store_sensitivities="ram", + solver_type="Mumps", **data_kwargs, ) params.write_ui_json(path=tmp_path / "Inv_run.ui.json") From 6b300513ad095b751bfd3ba055601c1d30ef2340 Mon Sep 17 00:00:00 2001 From: dominiquef Date: Fri, 14 Mar 2025 13:12:26 -0700 Subject: [PATCH 8/8] Bump tolerance for mt --- tests/run_tests/driver_mt_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_tests/driver_mt_test.py b/tests/run_tests/driver_mt_test.py index 1bbe8346..a7a8b193 100644 --- a/tests/run_tests/driver_mt_test.py +++ b/tests/run_tests/driver_mt_test.py @@ -179,7 +179,7 @@ def test_magnetotellurics_run(tmp_path: Path, max_iterations=1, pytest=True): ) output["data"] = orig_zyy_real_1 if pytest: - check_target(output, target_run) + check_target(output, target_run, tolerance=0.2) nan_ind = np.isnan(run_ws.get_entity("Iteration_0_model")[0].values) inactive_ind = run_ws.get_entity("active_cells")[0].values == 0 assert np.all(nan_ind == inactive_ind)