Merge pull request #70 from MiraGeoscience/merge_main_to_develop

GEOPY-2050: Merge main to develop

Author: sebhmg

.github/workflows/python_analysis.yml

@@ -38,7 +38,7 @@ 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'

deps-lock-config.yaml

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

docs/source/conf.py

@@ -21,6 +21,11 @@
 
 # The full version, including alpha/beta/rc tags.
 release = version("plate-simulation")
+# drop the post segment if any for release
+pep_version = Version(release)
+if pep_version.is_postrelease:
+    release = pep_version.base_version
+
 # The shorter X.Y.Z version.
 version = Version(release).base_version
 

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: c01e5e889e8f853d57ca3a4eda1715420415cf7c7803a5f97be838a76233152d
+# input_hash: 17a70c67327f1ccfdb9f4ee0dc937bc083a6228ffb04d94132c0d1f516b5e92e
 
 channels:
   - conda-forge
@@ -36,12 +36,11 @@ dependencies:
   - discretize=0.11.2=py310ha2bacc8_1
   - distributed=2024.6.2=pyhd8ed1ab_0
   - docutils=0.19=py310hff52083_1
-  - empymod=2.2.2=pyhd8ed1ab_0
   - exceptiongroup=1.2.2=pyhd8ed1ab_1
   - fasteners=0.19=pyhd8ed1ab_1
   - fonttools=4.56.0=py310h89163eb_0
   - freetype=2.12.1=h267a509_2
-  - fsspec=2022.11.0=pyhd8ed1ab_0
+  - fsspec=2025.2.0=pyhd8ed1ab_0
   - geoana=0.7.2=py310ha2bacc8_0
   - h2=4.2.0=pyhd8ed1ab_0
   - h5py=3.13.0=nompi_py310h60e0fe6_100
@@ -64,11 +63,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
@@ -79,11 +78,10 @@ dependencies:
   - libgcc-ng=14.2.0=h69a702a_2
   - libgfortran=14.2.0=h69a702a_2
   - libgfortran5=14.2.0=hf1ad2bd_2
-  - libhwloc=2.11.1=default_hecaa2ac_1000
+  - libhwloc=2.11.2=default_h0d58e46_1001
   - libiconv=1.18=h4ce23a2_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
-  - libllvm15=15.0.7=ha7bfdaf_5
+  - liblapack=3.9.0=31_hc41d3b0_mkl
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
@@ -102,25 +100,22 @@ dependencies:
   - libxml2=2.13.6=h8d12d68_0
   - libzlib=1.3.1=hb9d3cd8_2
   - llvm-openmp=19.1.7=h024ca30_0
-  - llvmlite=0.44.0=py310h1a6248f_0
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h89163eb_1
   - matplotlib-base=3.8.4=py310hef631a5_2
   - mccabe=0.7.0=pyhd8ed1ab_1
   - 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
   - munkres=1.1.4=pyh9f0ad1d_0
   - ncurses=6.5=h2d0b736_3
-  - numba=0.61.0=py310h699fe88_1
   - numcodecs=0.13.1=py310h5eaa309_0
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
   - openssl=3.4.1=h7b32b05_0
   - packaging=24.2=pyhd8ed1ab_2
-  - pandas=2.2.3=py310h5eaa309_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.0.1=pyh8b19718_0
@@ -131,19 +126,19 @@ dependencies:
   - pycparser=2.22=pyh29332c3_1
   - pydantic=2.5.3=pyhd8ed1ab_0
   - pydantic-core=2.14.6=py310hcb5633a_1
-  - 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.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
   - python-mumps=0.0.3=py310h6410a28_0
-  - python-tzdata=2023.4=pyhd8ed1ab_0
   - python_abi=3.10=5_cp310
-  - pytz=2024.1=pyhd8ed1ab_0
+  - pytz=2025.1=pyhd8ed1ab_0
   - pyyaml=6.0.2=py310h89163eb_2
   - readline=8.2=h8c095d6_2
   - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
@@ -162,7 +157,7 @@ dependencies:
   - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
   - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
   - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
-  - tbb=2021.12.0=h84d6215_4
+  - tbb=2021.13.0=hceb3a55_1
   - tblib=3.0.0=pyhd8ed1ab_1
   - threadpoolctl=3.3.0=pyhc1e730c_0
   - tk=8.6.13=noxft_h4845f30_101
@@ -189,12 +184,11 @@ dependencies:
   - zstd=1.5.7=hb8e6e7a_1
   - pip:
       - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@94e2e48fb93d9819a63f11f10cf11d487fbdb20f
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f87067908f8262029ea860c607657a39cd99644f
       - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
       - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab
       - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4
-      - pymatsolver == 0.3.1
-      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@a43fd83752f5064adfd4c2485e7613348d14714e
+      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@4db70217b32ef026a4cd92a524dfd11c74c6f61e
 
 variables:
   KMP_WARNINGS: 0

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

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: c01e5e889e8f853d57ca3a4eda1715420415cf7c7803a5f97be838a76233152d
+# input_hash: 17a70c67327f1ccfdb9f4ee0dc937bc083a6228ffb04d94132c0d1f516b5e92e
 
 channels:
   - conda-forge
@@ -29,11 +29,10 @@ dependencies:
   - dask-core=2024.6.2=pyhd8ed1ab_0
   - discretize=0.11.2=py310ha2bacc8_1
   - distributed=2024.6.2=pyhd8ed1ab_0
-  - empymod=2.2.2=pyhd8ed1ab_0
   - fasteners=0.19=pyhd8ed1ab_1
   - fonttools=4.56.0=py310h89163eb_0
   - freetype=2.12.1=h267a509_2
-  - fsspec=2022.11.0=pyhd8ed1ab_0
+  - fsspec=2025.2.0=pyhd8ed1ab_0
   - geoana=0.7.2=py310ha2bacc8_0
   - h2=4.2.0=pyhd8ed1ab_0
   - h5py=3.13.0=nompi_py310h60e0fe6_100
@@ -52,11 +51,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
@@ -67,11 +66,10 @@ dependencies:
   - libgcc-ng=14.2.0=h69a702a_2
   - libgfortran=14.2.0=h69a702a_2
   - libgfortran5=14.2.0=hf1ad2bd_2
-  - libhwloc=2.11.1=default_hecaa2ac_1000
+  - libhwloc=2.11.2=default_h0d58e46_1001
   - libiconv=1.18=h4ce23a2_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=20_linux64_mkl
-  - libllvm15=15.0.7=ha7bfdaf_5
+  - liblapack=3.9.0=31_hc41d3b0_mkl
   - liblzma=5.6.4=hb9d3cd8_0
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
@@ -90,24 +88,21 @@ dependencies:
   - libxml2=2.13.6=h8d12d68_0
   - libzlib=1.3.1=hb9d3cd8_2
   - llvm-openmp=19.1.7=h024ca30_0
-  - llvmlite=0.44.0=py310h1a6248f_0
   - locket=1.0.0=pyhd8ed1ab_0
   - 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
   - munkres=1.1.4=pyh9f0ad1d_0
   - ncurses=6.5=h2d0b736_3
-  - numba=0.61.0=py310h699fe88_1
   - numcodecs=0.13.1=py310h5eaa309_0
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
   - openssl=3.4.1=h7b32b05_0
   - packaging=24.2=pyhd8ed1ab_2
-  - pandas=2.2.3=py310h5eaa309_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
   - pip=25.0.1=pyh8b19718_0
@@ -116,15 +111,14 @@ dependencies:
   - pycparser=2.22=pyh29332c3_1
   - pydantic=2.5.3=pyhd8ed1ab_0
   - pydantic-core=2.14.6=py310hcb5633a_1
-  - 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
   - python=3.10.16=he725a3c_1_cpython
   - python-dateutil=2.9.0.post0=pyhff2d567_1
   - python-mumps=0.0.3=py310h6410a28_0
-  - python-tzdata=2023.4=pyhd8ed1ab_0
   - python_abi=3.10=5_cp310
-  - pytz=2024.1=pyhd8ed1ab_0
   - pyyaml=6.0.2=py310h89163eb_2
   - readline=8.2=h8c095d6_2
   - rtree=1.2.0=py310haf1e407_1
@@ -133,7 +127,7 @@ dependencies:
   - setuptools=75.8.2=pyhff2d567_0
   - six=1.17.0=pyhd8ed1ab_0
   - sortedcontainers=2.4.0=pyhd8ed1ab_1
-  - tbb=2021.12.0=h84d6215_4
+  - tbb=2021.13.0=hceb3a55_1
   - tblib=3.0.0=pyhd8ed1ab_1
   - threadpoolctl=3.3.0=pyhc1e730c_0
   - tk=8.6.13=noxft_h4845f30_101
@@ -157,12 +151,11 @@ dependencies:
   - zstd=1.5.7=hb8e6e7a_1
   - pip:
       - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@6ba24321d5311bbaf7ab460261ce6730ed541131
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@94e2e48fb93d9819a63f11f10cf11d487fbdb20f
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@f87067908f8262029ea860c607657a39cd99644f
       - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@275985aa18af76d70d55311e45dcfed149e62089
       - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@680a233e2d3380c084a05a6e3cb51b28e6b450ab
       - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@39de1da1495aff6d16641d408317619e23adbdb4
-      - pymatsolver == 0.3.1
-      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@a43fd83752f5064adfd4c2485e7613348d14714e
+      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@4db70217b32ef026a4cd92a524dfd11c74c6f61e
 
 variables:
   KMP_WARNINGS: 0