Merge branch 'GEOPY-2661' into GEOPY-2701-2661

Author: domfournier

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
 #    hooks:
 #    -   id: mypy
 #        additional_dependencies: [
-#            numpy==1.26.*,
+#            numpy==2.4.*,
 #            types-toml,
 #            types-PyYAML,
 #            tomli  # to read config from pyproject.toml

README.rst

@@ -52,7 +52,7 @@ Documentation
 
 Installation
 ^^^^^^^^^^^^
-**simpeg-drivers** is currently written for Python 3.10 or higher.
+**simpeg-drivers** is currently written for Python 3.12 or higher.
 
 Install Conda
 -------------

docs/environment.yml

@@ -4,7 +4,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python=3.10
+  - python=3.12
   - scipy
   - numpy
   - h5py

environments/py-3.12-linux-64-dev.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 6793690b16c5a3cfe004fcc8c0e7124a7465b37b9453989be2c9d9c7bf248288
+# input_hash: b650972838f330e6f6ff8085b1b9f2d62dc60aa14a8c4e08de2c9a72ca866d3c
 
 channels:
   - conda-forge
@@ -28,7 +28,7 @@ dependencies:
   - brotli=1.2.0=hed03a55_1
   - brotli-bin=1.2.0=hb03c661_1
   - brotli-python=1.2.0=py312hdb49522_1
-  - bzip2=1.0.8=hda65f42_8
+  - bzip2=1.0.8=hda65f42_9
   - c-ares=1.34.6=hb03c661_0
   - ca-certificates=2026.1.4=hbd8a1cb_0
   - cached-property=1.5.2=hd8ed1ab_1
@@ -125,10 +125,10 @@ dependencies:
   - libffi=3.5.2=h3435931_0
   - libfreetype=2.14.1=ha770c72_0
   - libfreetype6=2.14.1=h73754d4_0
-  - libgcc=15.2.0=he0feb66_17
-  - libgcc-ng=15.2.0=h69a702a_17
-  - libgfortran=15.2.0=h69a702a_17
-  - libgfortran5=15.2.0=h68bc16d_17
+  - libgcc=15.2.0=he0feb66_18
+  - libgcc-ng=15.2.0=h69a702a_18
+  - libgfortran=15.2.0=h69a702a_18
+  - libgfortran5=15.2.0=h68bc16d_18
   - libhwloc=2.12.2=default_hafda6a7_1000
   - libiconv=1.18=h3b78370_2
   - libjpeg-turbo=3.1.2=hb03c661_0
@@ -137,13 +137,13 @@ dependencies:
   - libnghttp2=1.67.0=had1ee68_0
   - libnsl=2.0.1=hb9d3cd8_1
   - libpng=1.6.55=h421ea60_0
-  - libscotch=7.0.10=int32_h8512f2c_2
+  - libscotch=7.0.11=int32_h865694f_0
   - libsodium=1.0.20=h4ab18f5_0
   - libspatialindex=2.1.0=he57a185_0
   - libsqlite=3.51.2=h0c1763c_0
   - libssh2=1.11.1=hcf80075_0
-  - libstdcxx=15.2.0=h934c35e_17
-  - libstdcxx-ng=15.2.0=hdf11a46_17
+  - libstdcxx=15.2.0=h934c35e_18
+  - libstdcxx-ng=15.2.0=hdf11a46_18
   - libtiff=4.7.1=h9d88235_1
   - libuuid=2.41.3=h5347b49_0
   - libuv=1.51.0=hb03c661_1
@@ -166,8 +166,8 @@ dependencies:
   - mistune=3.2.0=pyhcf101f3_0
   - mkl=2025.3.0=h0e700b2_463
   - msgpack-python=1.1.2=py312hd9148b4_1
-  - mumps-include=5.8.1=h1795ed4_4
-  - mumps-seq=5.8.1=h4374b6a_4
+  - mumps-include=5.8.2=h1795ed4_1
+  - mumps-seq=5.8.2=h31f7764_1
   - munkres=1.1.4=pyhd8ed1ab_1
   - nbclient=0.10.4=pyhd8ed1ab_0
   - nbconvert=7.16.6=hc388f54_1
@@ -185,7 +185,7 @@ dependencies:
   - openssl=3.6.1=h35e630c_1
   - overrides=7.7.0=pyhd8ed1ab_1
   - packaging=26.0=pyhcf101f3_0
-  - pandas=3.0.0=py312h8ecdadd_0
+  - pandas=3.0.1=py312h8ecdadd_0
   - pandoc=3.9=ha770c72_0
   - pandocfilters=1.5.0=pyhd8ed1ab_0
   - parso=0.8.6=pyhcf101f3_0
@@ -217,7 +217,7 @@ dependencies:
   - python-fastjsonschema=2.21.2=pyhe01879c_0
   - python-gil=3.12.12=hd8ed1ab_2
   - python-json-logger=2.0.7=pyhd8ed1ab_0
-  - python-mumps=0.0.6=nompi_hf5ef983
+  - python-mumps=0.0.6=nompi_h4762de1
   - python-tzdata=2025.3=pyhd8ed1ab_0
   - python_abi=3.12=8_cp312
   - pytz=2025.2=pyhd8ed1ab_0
@@ -260,7 +260,7 @@ dependencies:
   - tomlkit=0.14.0=pyha770c72_0
   - toolz=1.1.0=pyhd8ed1ab_1
   - tornado=6.5.3=py312h4c3975b_0
-  - tqdm=4.67.3=pyh8f84b5b_0
+  - tqdm=4.66.6=pyhd8ed1ab_0
   - traitlets=5.14.3=pyhd8ed1ab_1
   - trimesh=4.1.8=pyhd8ed1ab_0
   - typing-extensions=4.15.0=h396c80c_0
@@ -290,9 +290,9 @@ dependencies:
   - zlib-ng=2.3.3=hceb46e0_1
   - zstd=1.5.7=hb78ec9c_6
   - pip:
-    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56a2518edd539f1e3c9468640a643bd1cd9c3850
-    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c177431c791a5f5dd280985ddaf3615790e655fa
-    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@019ef68933e72528f45902ac32c783d00bb51992
+    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@668a9e0da5214e4a3bce466321cd910f1bb00b02
+    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@9e0a86e5afadfe9c55e9811317827a4f6c2c70c4
+    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@5a6de92816acb737499a8e188eb5b97acb966f37
     - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
 
 variables:

environments/py-3.12-linux-64.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 6793690b16c5a3cfe004fcc8c0e7124a7465b37b9453989be2c9d9c7bf248288
+# input_hash: b650972838f330e6f6ff8085b1b9f2d62dc60aa14a8c4e08de2c9a72ca866d3c
 
 channels:
   - conda-forge
@@ -14,13 +14,14 @@ dependencies:
   - brotli=1.2.0=hed03a55_1
   - brotli-bin=1.2.0=hb03c661_1
   - brotli-python=1.2.0=py312hdb49522_1
-  - bzip2=1.0.8=hda65f42_8
+  - bzip2=1.0.8=hda65f42_9
   - c-ares=1.34.6=hb03c661_0
   - ca-certificates=2026.1.4=hbd8a1cb_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
   - click=8.3.1=pyh8f84b5b_1
   - cloudpickle=3.1.2=pyhcf101f3_1
+  - colorama=0.4.6=pyhd8ed1ab_1
   - contourpy=1.3.3=py312h0a2e395_4
   - cycler=0.12.1=pyhcf101f3_2
   - cytoolz=1.1.0=py312h4c3975b_1
@@ -63,10 +64,10 @@ dependencies:
   - libffi=3.5.2=h3435931_0
   - libfreetype=2.14.1=ha770c72_0
   - libfreetype6=2.14.1=h73754d4_0
-  - libgcc=15.2.0=he0feb66_17
-  - libgcc-ng=15.2.0=h69a702a_17
-  - libgfortran=15.2.0=h69a702a_17
-  - libgfortran5=15.2.0=h68bc16d_17
+  - libgcc=15.2.0=he0feb66_18
+  - libgcc-ng=15.2.0=h69a702a_18
+  - libgfortran=15.2.0=h69a702a_18
+  - libgfortran5=15.2.0=h68bc16d_18
   - libhwloc=2.12.2=default_hafda6a7_1000
   - libiconv=1.18=h3b78370_2
   - libjpeg-turbo=3.1.2=hb03c661_0
@@ -75,12 +76,12 @@ dependencies:
   - libnghttp2=1.67.0=had1ee68_0
   - libnsl=2.0.1=hb9d3cd8_1
   - libpng=1.6.55=h421ea60_0
-  - libscotch=7.0.10=int32_h8512f2c_2
+  - libscotch=7.0.11=int32_h865694f_0
   - libspatialindex=2.1.0=he57a185_0
   - libsqlite=3.51.2=h0c1763c_0
   - libssh2=1.11.1=hcf80075_0
-  - libstdcxx=15.2.0=h934c35e_17
-  - libstdcxx-ng=15.2.0=hdf11a46_17
+  - libstdcxx=15.2.0=h934c35e_18
+  - libstdcxx-ng=15.2.0=hdf11a46_18
   - libtiff=4.7.1=h9d88235_1
   - libuuid=2.41.3=h5347b49_0
   - libwebp-base=1.6.0=hd42ef1d_0
@@ -96,16 +97,16 @@ dependencies:
   - metis=5.1.0=hd0bcaf9_1007
   - mkl=2025.3.0=h0e700b2_463
   - msgpack-python=1.1.2=py312hd9148b4_1
-  - mumps-include=5.8.1=h1795ed4_4
-  - mumps-seq=5.8.1=h4374b6a_4
+  - mumps-include=5.8.2=h1795ed4_1
+  - mumps-seq=5.8.2=h31f7764_1
   - munkres=1.1.4=pyhd8ed1ab_1
   - ncurses=6.5=h2d0b736_3
   - numcodecs=0.15.1=py312hf79963d_1
   - numpy=2.4.2=py312h33ff503_1
   - openjpeg=2.5.4=h55fea9a_0
   - openssl=3.6.1=h35e630c_1
   - packaging=26.0=pyhcf101f3_0
-  - pandas=3.0.0=py312h8ecdadd_0
+  - pandas=3.0.1=py312h8ecdadd_0
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=12.1.1=py312h50c33e8_0
   - pip=26.0.1=pyh8b19718_0
@@ -119,7 +120,7 @@ dependencies:
   - pysocks=1.7.1=pyha55dd90_7
   - python=3.12.12=hd63d673_2_cpython
   - python-dateutil=2.9.0.post0=pyhe01879c_2
-  - python-mumps=0.0.6=nompi_hf5ef983
+  - python-mumps=0.0.6=nompi_h4762de1
   - python-tzdata=2025.3=pyhd8ed1ab_0
   - python_abi=3.12=8_cp312
   - pyyaml=6.0.3=py312h8a5da7c_1
@@ -137,7 +138,7 @@ dependencies:
   - tk=8.6.13=noxft_h366c992_103
   - toolz=1.1.0=pyhd8ed1ab_1
   - tornado=6.5.3=py312h4c3975b_0
-  - tqdm=4.67.3=pyh8f84b5b_0
+  - tqdm=4.66.6=pyhd8ed1ab_0
   - trimesh=4.1.8=pyhd8ed1ab_0
   - typing-extensions=4.15.0=h396c80c_0
   - typing-inspection=0.4.2=pyhd8ed1ab_1
@@ -157,9 +158,9 @@ dependencies:
   - zlib-ng=2.3.3=hceb46e0_1
   - zstd=1.5.7=hb78ec9c_6
   - pip:
-    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56a2518edd539f1e3c9468640a643bd1cd9c3850
-    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c177431c791a5f5dd280985ddaf3615790e655fa
-    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@019ef68933e72528f45902ac32c783d00bb51992
+    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@668a9e0da5214e4a3bce466321cd910f1bb00b02
+    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@9e0a86e5afadfe9c55e9811317827a4f6c2c70c4
+    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@5a6de92816acb737499a8e188eb5b97acb966f37
     - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
 
 variables:

environments/py-3.12-win-64-dev.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: cf32723a98f275c54bf9d72aff483b8966c549a89f0f7d16dbef8714d2400a91
+# input_hash: 5f0f60749c127e0916070a45b3988ee6501ef40eee92cff0dec0018df64097ea
 
 channels:
   - conda-forge
@@ -28,7 +28,7 @@ dependencies:
   - brotli=1.2.0=h2d644bc_1
   - brotli-bin=1.2.0=hfd05255_1
   - brotli-python=1.2.0=py312hc6d9e41_1
-  - bzip2=1.0.8=h0ad9c76_8
+  - bzip2=1.0.8=h0ad9c76_9
   - ca-certificates=2026.1.4=h4c7d964_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
@@ -120,8 +120,8 @@ dependencies:
   - libffi=3.5.2=h3d046cb_0
   - libfreetype=2.14.1=h57928b3_0
   - libfreetype6=2.14.1=hdbac1cb_0
-  - libgcc=15.2.0=h8ee18e1_17
-  - libgomp=15.2.0=h8ee18e1_17
+  - libgcc=15.2.0=h8ee18e1_18
+  - libgomp=15.2.0=h8ee18e1_18
   - libhwloc=2.12.2=default_h4379cf1_1000
   - libiconv=1.18=hc1393d2_2
   - libjpeg-turbo=3.1.2=hfd05255_0
@@ -151,15 +151,15 @@ dependencies:
   - mistune=3.2.0=pyhcf101f3_0
   - mkl=2025.3.0=hac47afa_455
   - msgpack-python=1.1.2=py312hf90b1b7_1
-  - mumps-seq=5.8.1=hd297af6_4
+  - mumps-seq=5.8.2=h607cc0b_1
   - munkres=1.1.4=pyhd8ed1ab_1
   - nbclient=0.10.4=pyhd8ed1ab_0
   - nbconvert=7.16.6=hc388f54_1
   - nbconvert-core=7.16.6=pyhcf101f3_1
   - nbconvert-pandoc=7.16.6=h7d6f222_1
   - nbformat=5.10.4=pyhd8ed1ab_1
   - nest-asyncio=1.6.0=pyhd8ed1ab_1
-  - nodejs=25.6.0=he453025_0
+  - nodejs=25.6.1=he453025_0
   - notebook=7.5.3=pyhcf101f3_0
   - notebook-shim=0.2.4=pyhd8ed1ab_1
   - numcodecs=0.15.1=py312hc128f0a_1
@@ -168,7 +168,7 @@ dependencies:
   - openssl=3.6.1=hf411b9b_1
   - overrides=7.7.0=pyhd8ed1ab_1
   - packaging=26.0=pyhcf101f3_0
-  - pandas=3.0.0=py312h95189c4_0
+  - pandas=3.0.1=py312h95189c4_0
   - pandoc=3.9=h57928b3_0
   - pandocfilters=1.5.0=pyhd8ed1ab_0
   - parso=0.8.6=pyhcf101f3_0
@@ -198,7 +198,7 @@ dependencies:
   - python-fastjsonschema=2.21.2=pyhe01879c_0
   - python-gil=3.12.12=hd8ed1ab_2
   - python-json-logger=2.0.7=pyhd8ed1ab_0
-  - python-mumps=0.0.6=nompi_h368aa49
+  - python-mumps=0.0.6=nompi_hd0d704b
   - python-tzdata=2025.3=pyhd8ed1ab_0
   - python_abi=3.12=8_cp312
   - pytz=2025.2=pyhd8ed1ab_0
@@ -242,7 +242,7 @@ dependencies:
   - tomlkit=0.14.0=pyha770c72_0
   - toolz=1.1.0=pyhd8ed1ab_1
   - tornado=6.5.4=py312he06e257_0
-  - tqdm=4.67.3=pyha7b4d00_0
+  - tqdm=4.66.6=pyhd8ed1ab_0
   - traitlets=5.14.3=pyhd8ed1ab_1
   - trimesh=4.1.8=pyhd8ed1ab_0
   - typing-extensions=4.15.0=h396c80c_0
@@ -277,9 +277,9 @@ dependencies:
   - zlib-ng=2.3.3=h0261ad2_1
   - zstd=1.5.7=h534d264_6
   - pip:
-    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56a2518edd539f1e3c9468640a643bd1cd9c3850
-    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c177431c791a5f5dd280985ddaf3615790e655fa
-    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@019ef68933e72528f45902ac32c783d00bb51992
+    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@668a9e0da5214e4a3bce466321cd910f1bb00b02
+    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@9e0a86e5afadfe9c55e9811317827a4f6c2c70c4
+    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@5a6de92816acb737499a8e188eb5b97acb966f37
     - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
 
 variables:

environments/py-3.12-win-64.conda.lock.yml

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: cf32723a98f275c54bf9d72aff483b8966c549a89f0f7d16dbef8714d2400a91
+# input_hash: 5f0f60749c127e0916070a45b3988ee6501ef40eee92cff0dec0018df64097ea
 
 channels:
   - conda-forge
@@ -14,7 +14,7 @@ dependencies:
   - brotli=1.2.0=h2d644bc_1
   - brotli-bin=1.2.0=hfd05255_1
   - brotli-python=1.2.0=py312hc6d9e41_1
-  - bzip2=1.0.8=h0ad9c76_8
+  - bzip2=1.0.8=h0ad9c76_9
   - ca-certificates=2026.1.4=h4c7d964_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
@@ -59,8 +59,8 @@ dependencies:
   - libffi=3.5.2=h3d046cb_0
   - libfreetype=2.14.1=h57928b3_0
   - libfreetype6=2.14.1=hdbac1cb_0
-  - libgcc=15.2.0=h8ee18e1_17
-  - libgomp=15.2.0=h8ee18e1_17
+  - libgcc=15.2.0=h8ee18e1_18
+  - libgomp=15.2.0=h8ee18e1_18
   - libhwloc=2.12.2=default_h4379cf1_1000
   - libiconv=1.18=hc1393d2_2
   - libjpeg-turbo=3.1.2=hfd05255_0
@@ -83,14 +83,14 @@ dependencies:
   - matplotlib-base=3.10.8=py312h0ebf65c_0
   - mkl=2025.3.0=hac47afa_455
   - msgpack-python=1.1.2=py312hf90b1b7_1
-  - mumps-seq=5.8.1=hd297af6_4
+  - mumps-seq=5.8.2=h607cc0b_1
   - munkres=1.1.4=pyhd8ed1ab_1
   - numcodecs=0.15.1=py312hc128f0a_1
   - numpy=2.4.2=py312ha72d056_1
   - openjpeg=2.5.4=h24db6dd_0
   - openssl=3.6.1=hf411b9b_1
   - packaging=26.0=pyhcf101f3_0
-  - pandas=3.0.0=py312h95189c4_0
+  - pandas=3.0.1=py312h95189c4_0
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=12.1.1=py312h31f0997_0
   - pip=26.0.1=pyh8b19718_0
@@ -104,7 +104,7 @@ dependencies:
   - pysocks=1.7.1=pyh09c184e_7
   - python=3.12.12=h0159041_2_cpython
   - python-dateutil=2.9.0.post0=pyhe01879c_2
-  - python-mumps=0.0.6=nompi_h368aa49
+  - python-mumps=0.0.6=nompi_hd0d704b
   - python-tzdata=2025.3=pyhd8ed1ab_0
   - python_abi=3.12=8_cp312
   - pyyaml=6.0.3=py312h05f76fc_1
@@ -121,7 +121,7 @@ dependencies:
   - tk=8.6.13=h6ed50ae_3
   - toolz=1.1.0=pyhd8ed1ab_1
   - tornado=6.5.4=py312he06e257_0
-  - tqdm=4.67.3=pyha7b4d00_0
+  - tqdm=4.66.6=pyhd8ed1ab_0
   - trimesh=4.1.8=pyhd8ed1ab_0
   - typing-extensions=4.15.0=h396c80c_0
   - typing-inspection=0.4.2=pyhd8ed1ab_1
@@ -146,9 +146,9 @@ dependencies:
   - zlib-ng=2.3.3=h0261ad2_1
   - zstd=1.5.7=h534d264_6
   - pip:
-    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@56a2518edd539f1e3c9468640a643bd1cd9c3850
-    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c177431c791a5f5dd280985ddaf3615790e655fa
-    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@019ef68933e72528f45902ac32c783d00bb51992
+    - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@668a9e0da5214e4a3bce466321cd910f1bb00b02
+    - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@9e0a86e5afadfe9c55e9811317827a4f6c2c70c4
+    - grid-apps @ git+https://github.com/MiraGeoscience/grid-apps.git@5a6de92816acb737499a8e188eb5b97acb966f37
     - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@ef94a62a27ecf9713377801f6632861a07e2a65c
 
 variables: