Merge branch 'develop' into GEOPY-1866

Author: domfournier

.github/workflows/python_analysis.yml

@@ -34,11 +34,11 @@ jobs:
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
     with:
       package-manager: 'conda'
-      python-versions: '["3.10", "3.11"]'
+      python-versions: '["3.10", "3.11", "3.12"]'
       os: '["ubuntu-latest", "windows-latest"]'
       cache-number: 1
       codecov-reference-python-version: '3.10'
-      codecov-reference-os: '["windows-latest"]'
+      codecov-reference-os: '["ubuntu-latest"]'
       timeout-minutes: 40
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

deps-lock-config.yaml

@@ -2,3 +2,4 @@ include_dev: True
 py_versions:
   - "3.10"
   - "3.11"
+  - "3.12"

environments/env-python-3.12.yml

@@ -0,0 +1,3 @@
+dependencies:
+  - python=3.12.*
+  - pip

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

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104
+# input_hash: 70ca38b7c7dbf2affc8b75ba0f1e07e95ff3ab4813a8da5c00eabec011825ad8
 
 channels:
   - conda-forge
@@ -61,7 +61,7 @@ dependencies:
   - fqdn=1.5.1=pyhd8ed1ab_1
   - freetype=2.12.1=h267a509_2
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - geoana=0.5.0=py310hcb52e73_4
+  - geoana=0.7.2=py310ha2bacc8_0
   - greenlet=3.1.1=py310hf71b8c6_1
   - h11=0.14.0=pyhd8ed1ab_1
   - h2=4.2.0=pyhd8ed1ab_0
@@ -79,11 +79,11 @@ dependencies:
   - importlib_resources=6.5.2=pyhd8ed1ab_0
   - iniconfig=2.0.0=pyhd8ed1ab_1
   - ipykernel=6.29.5=pyh3099207_0
-  - ipython=8.32.0=pyh907856f_0
+  - ipython=8.33.0=pyh907856f_0
   - ipython_genutils=0.2.0=pyhd8ed1ab_2
   - ipywidgets=7.8.5=pyhd8ed1ab_0
   - isoduration=20.11.0=pyhd8ed1ab_1
-  - isort=6.0.0=pyhd8ed1ab_0
+  - isort=6.0.1=pyhd8ed1ab_0
   - jedi=0.19.2=pyhd8ed1ab_1
   - jinja2=3.1.5=pyhd8ed1ab_0
   - joblib=1.4.2=pyhd8ed1ab_1
@@ -113,11 +113,11 @@ dependencies:
   - ld_impl_linux-64=2.43=h712a8e2_4
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=20_linux64_mkl
+  - libblas=3.9.0=31_hfdb39a5_mkl
   - libbrotlicommon=1.1.0=hb9d3cd8_2
   - libbrotlidec=1.1.0=hb9d3cd8_2
   - libbrotlienc=1.1.0=hb9d3cd8_2
-  - libcblas=3.9.0=20_linux64_mkl
+  - libcblas=3.9.0=31_h372d94f_mkl
   - libcurl=8.12.1=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libdlf=0.3.0=pyhd8ed1ab_1
@@ -131,7 +131,7 @@ dependencies:
   - libhwloc=2.11.1=default_hecaa2ac_1000
   - libiconv=1.18=h4ce23a2_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
+  - liblapack=3.9.0=31_hc41d3b0_mkl
   - libllvm15=15.0.7=ha7bfdaf_5
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
@@ -163,7 +163,7 @@ dependencies:
   - mdurl=0.1.2=pyhd8ed1ab_1
   - metis=5.1.0=hd0bcaf9_1007
   - mistune=3.1.2=pyhd8ed1ab_0
-  - mkl=2023.2.0=h84fe81f_50496
+  - mkl=2024.2.2=ha957f24_16
   - msgpack-python=1.1.0=py310h3788b33_0
   - mumps-include=5.7.3=ha770c72_7
   - mumps-seq=5.7.3=h2064c95_7
@@ -200,7 +200,7 @@ dependencies:
   - pluggy=1.5.0=pyhd8ed1ab_1
   - prometheus_client=0.21.1=pyhd8ed1ab_0
   - prompt-toolkit=3.0.50=pyha770c72_0
-  - psutil=6.1.1=py310ha75aee5_0
+  - psutil=7.0.0=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
   - ptyprocess=0.7.0=pyhd8ed1ab_1
   - pure_eval=0.2.3=pyhd8ed1ab_1
@@ -210,13 +210,13 @@ dependencies:
   - pydantic=2.10.6=pyh3cfb1c2_0
   - pydantic-core=2.27.2=py310h505e2c1_0
   - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0
-  - pydiso=0.1.2=py310h7b68af5_0
+  - pydiso=0.1.2=py310h69a6472_0
   - pygments=2.19.1=pyhd8ed1ab_0
   - pylint=3.3.4=pyh29332c3_0
   - pymatsolver=0.3.1=pyh48887ae_201
   - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha55dd90_7
-  - pytest=8.3.4=pyhd8ed1ab_1
+  - pytest=8.3.5=pyhd8ed1ab_0
   - pytest-cov=6.0.0=pyhd8ed1ab_1
   - python=3.10.16=he725a3c_1_cpython
   - python-dateutil=2.9.0.post0=pyhff2d567_1
@@ -238,7 +238,7 @@ dependencies:
   - scikit-learn=1.4.2=py310h981052a_1
   - scipy=1.14.1=py310hfcf56fc_2
   - send2trash=1.8.3=pyh0d859eb_1
-  - setuptools=75.8.0=pyhff2d567_0
+  - setuptools=75.8.2=pyhff2d567_0
   - six=1.17.0=pyhd8ed1ab_0
   - sniffio=1.3.1=pyhd8ed1ab_1
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
@@ -303,9 +303,9 @@ dependencies:
   - zstandard=0.19.0=py310h5764c6d_0
   - zstd=1.5.7=hb8e6e7a_1
   - pip:
-      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48
-      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
+      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
       - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
       - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4
 

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

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: f39d0e50145913995309b3351ecd85215cdd2608ef353f901b8bf849e92e4104
+# input_hash: 70ca38b7c7dbf2affc8b75ba0f1e07e95ff3ab4813a8da5c00eabec011825ad8
 
 channels:
   - conda-forge
@@ -35,7 +35,7 @@ dependencies:
   - fonttools=4.56.0=py310h89163eb_0
   - freetype=2.12.1=h267a509_2
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - geoana=0.5.0=py310hcb52e73_4
+  - geoana=0.7.2=py310ha2bacc8_0
   - h2=4.2.0=pyhd8ed1ab_0
   - h5py=3.13.0=nompi_py310h60e0fe6_100
   - hdf5=1.14.3=nompi_h2d575fe_109
@@ -53,11 +53,11 @@ dependencies:
   - ld_impl_linux-64=2.43=h712a8e2_4
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
-  - libblas=3.9.0=20_linux64_mkl
+  - libblas=3.9.0=31_hfdb39a5_mkl
   - libbrotlicommon=1.1.0=hb9d3cd8_2
   - libbrotlidec=1.1.0=hb9d3cd8_2
   - libbrotlienc=1.1.0=hb9d3cd8_2
-  - libcblas=3.9.0=20_linux64_mkl
+  - libcblas=3.9.0=31_h372d94f_mkl
   - libcurl=8.12.1=h332b0f4_0
   - libdeflate=1.23=h4ddbbb0_0
   - libdlf=0.3.0=pyhd8ed1ab_1
@@ -71,7 +71,7 @@ dependencies:
   - libhwloc=2.11.1=default_hecaa2ac_1000
   - libiconv=1.18=h4ce23a2_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
+  - liblapack=3.9.0=31_hc41d3b0_mkl
   - libllvm15=15.0.7=ha7bfdaf_5
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
@@ -95,7 +95,7 @@ dependencies:
   - markupsafe=3.0.2=py310h89163eb_1
   - matplotlib-base=3.8.4=py310hef631a5_2
   - metis=5.1.0=hd0bcaf9_1007
-  - mkl=2023.2.0=h84fe81f_50496
+  - mkl=2024.2.2=ha957f24_16
   - msgpack-python=1.1.0=py310h3788b33_0
   - mumps-include=5.7.3=ha770c72_7
   - mumps-seq=5.7.3=h2064c95_7
@@ -111,12 +111,12 @@ dependencies:
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.0.1=pyh8b19718_0
-  - psutil=6.1.1=py310ha75aee5_0
+  - psutil=7.0.0=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
   - pydantic=2.10.6=pyh3cfb1c2_0
   - pydantic-core=2.27.2=py310h505e2c1_0
-  - pydiso=0.1.2=py310h7b68af5_0
+  - pydiso=0.1.2=py310h69a6472_0
   - pymatsolver=0.3.1=pyh48887ae_201
   - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha55dd90_7
@@ -130,7 +130,7 @@ dependencies:
   - readline=8.2=h8c095d6_2
   - scikit-learn=1.4.2=py310h981052a_1
   - scipy=1.14.1=py310hfcf56fc_2
-  - setuptools=75.8.0=pyhff2d567_0
+  - setuptools=75.8.2=pyhff2d567_0
   - six=1.17.0=pyhd8ed1ab_0
   - sortedcontainers=2.4.0=pyhd8ed1ab_1
   - tbb=2021.12.0=h84d6215_4
@@ -156,9 +156,9 @@ dependencies:
   - zstandard=0.19.0=py310h5764c6d_0
   - zstd=1.5.7=hb8e6e7a_1
   - pip:
-      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48
-      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
+      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
       - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
       - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4
 

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

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: win-64
-# input_hash: fb667d7ecd40ffa28a83b638bc3a532349c8f14f9d3d2e41da16dc1ef6b8922d
+# input_hash: 5b9b1265a46aad912e182524b6691d66e40b55b45e60a5abd2383bdab29f00b2
 
 channels:
   - conda-forge
@@ -59,7 +59,7 @@ dependencies:
   - fqdn=1.5.1=pyhd8ed1ab_1
   - freetype=2.12.1=hdaf720e_2
   - fsspec=2022.11.0=pyhd8ed1ab_0
-  - geoana=0.5.0=py310h4856b71_4
+  - geoana=0.7.2=py310h3e8ed56_0
   - greenlet=3.1.1=py310h9e98ed7_1
   - h11=0.14.0=pyhd8ed1ab_1
   - h2=4.2.0=pyhd8ed1ab_0
@@ -75,13 +75,13 @@ dependencies:
   - importlib_metadata=8.6.1=hd8ed1ab_0
   - importlib_resources=6.5.2=pyhd8ed1ab_0
   - iniconfig=2.0.0=pyhd8ed1ab_1
-  - intel-openmp=2023.2.0=h57928b3_50497
+  - intel-openmp=2024.2.1=h57928b3_1083
   - ipykernel=6.29.5=pyh4bbf305_0
-  - ipython=8.32.0=pyh9ab4c32_0
+  - ipython=8.33.0=pyh9ab4c32_0
   - ipython_genutils=0.2.0=pyhd8ed1ab_2
   - ipywidgets=7.8.5=pyhd8ed1ab_0
   - isoduration=20.11.0=pyhd8ed1ab_1
-  - isort=6.0.0=pyhd8ed1ab_0
+  - isort=6.0.1=pyhd8ed1ab_0
   - jedi=0.19.2=pyhd8ed1ab_1
   - jinja2=3.1.5=pyhd8ed1ab_0
   - joblib=1.4.2=pyhd8ed1ab_1
@@ -109,19 +109,19 @@ dependencies:
   - lcms2=2.17=hbcf6048_0
   - lerc=4.0.0=h63175ca_0
   - libaec=1.1.3=h63175ca_0
-  - libblas=3.9.0=20_win64_mkl
+  - libblas=3.9.0=31_h641d27c_mkl
   - libbrotlicommon=1.1.0=h2466b09_2
   - libbrotlidec=1.1.0=h2466b09_2
   - libbrotlienc=1.1.0=h2466b09_2
-  - libcblas=3.9.0=20_win64_mkl
+  - libcblas=3.9.0=31_h5e41251_mkl
   - libcurl=8.12.1=h88aaa65_0
   - libdeflate=1.23=h9062f6e_0
   - libdlf=0.3.0=pyhd8ed1ab_1
   - libffi=3.4.6=h537db12_0
   - libhwloc=2.11.1=default_h8125262_1000
   - libiconv=1.18=h135ad9c_1
   - libjpeg-turbo=3.0.0=hcfcfb64_1
-  - liblapack=3.9.0=20_win64_mkl
+  - liblapack=3.9.0=31_h1aa476e_mkl
   - liblzma=5.6.4=h2466b09_0
   - libpng=1.6.47=had7236b_0
   - libsodium=1.0.20=hc70643c_0
@@ -149,7 +149,7 @@ dependencies:
   - mdit-py-plugins=0.4.2=pyhd8ed1ab_1
   - mdurl=0.1.2=pyhd8ed1ab_1
   - mistune=3.1.2=pyhd8ed1ab_0
-  - mkl=2023.2.0=h6a75c08_50497
+  - mkl=2024.2.2=h66d3029_15
   - msgpack-python=1.1.0=py310hc19bc0b_0
   - msys2-conda-epoch=20160418=1
   - mumps-seq=5.7.3=h9576071_7
@@ -184,7 +184,7 @@ dependencies:
   - pluggy=1.5.0=pyhd8ed1ab_1
   - prometheus_client=0.21.1=pyhd8ed1ab_0
   - prompt-toolkit=3.0.50=pyha770c72_0
-  - psutil=6.1.1=py310ha8f682b_0
+  - psutil=7.0.0=py310ha8f682b_0
   - pthread-stubs=0.4=hcd874cb_1001
   - pthreads-win32=2.9.1=h2466b09_4
   - pure_eval=0.2.3=pyhd8ed1ab_1
@@ -194,13 +194,13 @@ dependencies:
   - pydantic=2.10.6=pyh3cfb1c2_0
   - pydantic-core=2.27.2=py310hc226416_0
   - pydata-sphinx-theme=0.15.4=pyhd8ed1ab_0
-  - pydiso=0.1.2=py310h5da8fee_0
+  - pydiso=0.1.2=py310h8f92c26_0
   - pygments=2.19.1=pyhd8ed1ab_0
   - pylint=3.3.4=pyh29332c3_0
   - pymatsolver=0.3.1=pyh48887ae_201
   - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyh09c184e_7
-  - pytest=8.3.4=pyhd8ed1ab_1
+  - pytest=8.3.5=pyhd8ed1ab_0
   - pytest-cov=6.0.0=pyhd8ed1ab_1
   - python=3.10.16=h37870fc_1_cpython
   - python-dateutil=2.9.0.post0=pyhff2d567_1
@@ -223,7 +223,7 @@ dependencies:
   - scikit-learn=1.4.2=py310hf2a6c47_1
   - scipy=1.14.1=py310hbd0dde3_2
   - send2trash=1.8.3=pyh5737063_1
-  - setuptools=75.8.0=pyhff2d567_0
+  - setuptools=75.8.2=pyhff2d567_0
   - six=1.17.0=pyhd8ed1ab_0
   - sniffio=1.3.1=pyhd8ed1ab_1
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
@@ -294,9 +294,9 @@ dependencies:
   - zstandard=0.19.0=py310h8d17308_0
   - zstd=1.5.7=hbeecb71_1
   - pip:
-      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@4d829b7b8759d7537a8184aa506548ddccf72041
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@99300455d1d5627d8a2e95a7217da2bab4921f48
-      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@42d85343d46e85faa8fd1f7ac8608a49fe1b4ced
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c5f762ae16395629d8a8e4e04dc7488a6c9c53f1
+      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
       - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@3c479f5d098332ff1c6e0eca0d56be6cc01e0911
       - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4