Merge pull request #61 from MiraGeoscience/merge_relese_to_develop

Merge release to develop

.gitignore

@@ -129,7 +129,6 @@ venv.bak/
 /.idea/*
 !/.idea/scopes/
 !/.idea/copyright/
-!/.idea/*.iml
 
 # mypy
 .mypy_cache/

.pre-commit-config.yaml

@@ -12,7 +12,7 @@ ci:
 
 repos:
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.6
+    rev: v0.9.1
     hooks:
     -   id: ruff
         args:
@@ -37,10 +37,10 @@ repos:
     -   id: relint
         args: [-W]  # to fail on warnings
 -   repo: https://github.com/MiraGeoscience/pre-commit-hooks
-    rev: v1.0.1
+    rev: v1.1.0
     hooks:
     -   id: check-copyright
-        files: (^LICENSE|^README(|-dev).rst|\.py|\.pyi)$
+        files: (^package\.rst|^LICENSE|^README(|-dev)\.rst|\.py|\.pyi)$
         exclude: (^\.|^docs/)
     -   id: prepare-commit-msg
     -   id: check-commit-msg

LICENSE

@@ -9,7 +9,7 @@
 
 MIT License
 
-Copyright (c) 2024 Mira Geoscience
+Copyright (c) 2024-2025 Mira Geoscience
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README-dev.rst

@@ -376,4 +376,4 @@ License
 
 Copyright
 ^^^^^^^^^
-Copyright (c) 2025 Mira Geoscience Ltd.
+Copyright (c) 2024-2025 Mira Geoscience Ltd.

README.rst

@@ -145,7 +145,7 @@ License
 ^^^^^^^
 MIT License
 
-Copyright (c) 2025 Mira Geoscience
+Copyright (c) 2024-2025 Mira Geoscience
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -181,4 +181,4 @@ Trademarks
 
 Copyright
 ^^^^^^^^^
-Copyright (c) 2025 Mira Geoscience Ltd.
+Copyright (c) 2024-2025 Mira Geoscience Ltd.

docs/source/conf.py

@@ -1,12 +1,3 @@
-# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-#  Copyright (c) 2025 Mira Geoscience Ltd.                                             '
-#                                                                                      '
-#  This file is part of plate-simulation package.                                      '
-#                                                                                      '
-#  plate-simulation is distributed under the terms and conditions of the MIT License   '
-#  (see LICENSE file at the root of this source code package).                         '
-# ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
-
 from datetime import datetime
 from importlib.metadata import version
 

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

@@ -1,6 +1,6 @@
 # Generated by conda-lock.
 # platform: linux-64
-# input_hash: 6ba9d660099d0b4fdfd62bb5d1f1f4b5bba42a3f4ffbc2872e5f2881a076da0c
+# input_hash: d80087a7e56c83ce08bc052c763894a796f6663cd3c3d911a4196fd651130cc1
 
 channels:
   - conda-forge
@@ -11,41 +11,41 @@ dependencies:
   - alabaster=0.7.16=pyhd8ed1ab_0
   - annotated-types=0.7.0=pyhd8ed1ab_1
   - asciitree=0.3.3=py_2
-  - astroid=3.3.6=py310hff52083_0
+  - astroid=3.3.8=py310hff52083_0
   - babel=2.16.0=pyhd8ed1ab_1
   - brotli=1.1.0=hb9d3cd8_2
   - brotli-bin=1.1.0=hb9d3cd8_2
   - brotli-python=1.1.0=py310hf71b8c6_2
   - bzip2=1.0.8=h4bc722e_7
-  - c-ares=1.34.3=hb9d3cd8_1
-  - ca-certificates=2024.8.30=hbcca054_0
+  - c-ares=1.34.4=hb9d3cd8_0
+  - ca-certificates=2024.12.14=hbcca054_0
   - cached-property=1.5.2=hd8ed1ab_1
   - cached_property=1.5.2=pyha770c72_1
-  - certifi=2024.8.30=pyhd8ed1ab_0
+  - certifi=2024.12.14=pyhd8ed1ab_0
   - cffi=1.17.1=py310h8deb56e_0
-  - charset-normalizer=3.4.0=pyhd8ed1ab_1
-  - click=8.1.7=unix_pyh707e725_1
-  - cloudpickle=3.1.0=pyhd8ed1ab_1
+  - charset-normalizer=3.4.1=pyhd8ed1ab_0
+  - click=8.1.8=pyh707e725_0
+  - cloudpickle=3.1.0=pyhd8ed1ab_2
   - colorama=0.4.6=pyhd8ed1ab_1
   - contourpy=1.3.1=py310h3788b33_0
-  - coverage=7.6.9=py310h89163eb_0
+  - coverage=7.6.10=py310h89163eb_0
   - cycler=0.12.1=pyhd8ed1ab_1
-  - cytoolz=1.0.0=py310ha75aee5_1
+  - cytoolz=1.0.1=py310ha75aee5_0
   - dask-core=2024.6.2=pyhd8ed1ab_0
   - dill=0.3.9=pyhd8ed1ab_1
   - discretize=0.10.0=py310hcb52e73_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.17.3=pyhd8ed1ab_0
-  - fonttools=4.55.3=py310h89163eb_0
+  - fasteners=0.19=pyhd8ed1ab_1
+  - fonttools=4.55.3=py310h89163eb_1
   - freetype=2.12.1=h267a509_2
   - fsspec=2022.11.0=pyhd8ed1ab_0
   - geoana=0.5.0=py310hcb52e73_4
   - h2=4.1.0=pyhd8ed1ab_1
-  - h5py=3.12.1=nompi_py310h60e0fe6_102
-  - hdf5=1.14.3=nompi_h2d575fe_108
+  - h5py=3.12.1=nompi_py310hacc6608_103
+  - hdf5=1.14.4=nompi_h2d575fe_105
   - hpack=4.0.0=pyhd8ed1ab_1
   - hyperframe=6.0.1=pyhd8ed1ab_1
   - idna=3.10=pyhd8ed1ab_1
@@ -54,7 +54,7 @@ dependencies:
   - importlib_metadata=8.5.0=hd8ed1ab_1
   - iniconfig=2.0.0=pyhd8ed1ab_1
   - isort=5.13.2=pyhd8ed1ab_1
-  - jinja2=3.1.4=pyhd8ed1ab_1
+  - jinja2=3.1.5=pyhd8ed1ab_0
   - joblib=1.4.2=pyhd8ed1ab_1
   - keyutils=1.6.1=h166bdaf_0
   - kiwisolver=1.4.7=py310h3788b33_0
@@ -69,9 +69,9 @@ dependencies:
   - libbrotlienc=1.1.0=hb9d3cd8_2
   - libcblas=3.9.0=20_linux64_mkl
   - libcurl=8.11.1=h332b0f4_0
-  - libdeflate=1.22=hb9d3cd8_0
-  - libdlf=0.3.0=pyhd8ed1ab_0
-  - libedit=3.1.20191231=he28a2e2_2
+  - libdeflate=1.23=h4ddbbb0_0
+  - libdlf=0.3.0=pyhd8ed1ab_1
+  - libedit=3.1.20240808=pl5321h7949ede_0
   - libev=4.33=hd590300_2
   - libffi=3.4.2=h7f98852_5
   - libgcc=14.2.0=h77fa898_1
@@ -86,20 +86,20 @@ dependencies:
   - liblzma=5.6.3=hb9d3cd8_1
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
-  - libpng=1.6.44=hadc24fc_0
+  - libpng=1.6.45=h943b412_0
   - libspatialindex=2.0.0=he02047a_0
   - libsqlite=3.47.2=hee588c1_0
   - libssh2=1.11.1=hf672d98_0
   - libstdcxx=14.2.0=hc0a3c3a_1
   - libstdcxx-ng=14.2.0=h4852527_1
-  - libtiff=4.7.0=hc4654cb_2
+  - libtiff=4.7.0=hd9ff511_3
   - libuuid=2.38.1=h0b41bf4_0
-  - libwebp-base=1.4.0=hd590300_0
+  - libwebp-base=1.5.0=h851e524_0
   - libxcb=1.17.0=h8a09558_0
   - libxcrypt=4.4.36=hd590300_1
   - libxml2=2.13.5=h0d44e9d_1
   - libzlib=1.3.1=hb9d3cd8_2
-  - llvm-openmp=19.1.5=h024ca30_0
+  - llvm-openmp=19.1.6=h024ca30_0
   - llvmlite=0.43.0=py310h1a6248f_1
   - locket=1.0.0=pyhd8ed1ab_0
   - markupsafe=3.0.2=py310h89163eb_1
@@ -108,30 +108,30 @@ dependencies:
   - mkl=2023.2.0=h84fe81f_50496
   - msgpack-python=1.1.0=py310h3788b33_0
   - munkres=1.1.4=pyh9f0ad1d_0
-  - ncurses=6.5=he02047a_1
+  - ncurses=6.5=h2d0b736_2
   - numba=0.60.0=py310h5dc88bb_0
   - numcodecs=0.13.1=py310h5eaa309_0
   - numpy=1.26.4=py310hb13e2d6_0
   - openjpeg=2.5.3=h5fbd93e_0
-  - openssl=3.4.0=hb9d3cd8_0
+  - openssl=3.4.0=h7b32b05_1
   - packaging=24.2=pyhd8ed1ab_2
   - pandas=2.2.3=py310h5eaa309_1
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
-  - pip=24.3.1=pyh8b19718_0
+  - pip=24.3.1=pyh8b19718_2
   - platformdirs=4.3.6=pyhd8ed1ab_1
   - pluggy=1.5.0=pyhd8ed1ab_1
-  - psutil=6.1.0=py310ha75aee5_0
+  - psutil=6.1.1=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
   - pycparser=2.22=pyh29332c3_1
   - pydantic=2.5.3=pyhd8ed1ab_0
   - pydantic-core=2.14.6=py310hcb5633a_1
   - pydiso=0.1.2=py310h7b68af5_0
-  - pygments=2.18.0=pyhd8ed1ab_1
-  - pylint=3.3.2=pyhd8ed1ab_1
+  - pygments=2.19.1=pyhd8ed1ab_0
+  - pylint=3.3.3=pyhd8ed1ab_0
   - pymatsolver=0.2.0=ha770c72_3
   - pymatsolver-base=0.2.0=pyh44b312d_3
-  - pyparsing=3.2.0=pyhd8ed1ab_2
+  - pyparsing=3.2.1=pyhd8ed1ab_0
   - pysocks=1.7.1=pyha55dd90_7
   - pytest=8.3.4=pyhd8ed1ab_1
   - pytest-cov=6.0.0=pyhd8ed1ab_1
@@ -142,12 +142,12 @@ dependencies:
   - pytz=2024.1=pyhd8ed1ab_0
   - pyyaml=6.0.2=py310ha75aee5_1
   - readline=8.2=h8228510_1
-  - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_0
+  - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
   - requests=2.32.3=pyhd8ed1ab_1
   - rtree=1.2.0=py310haf1e407_1
   - scikit-learn=1.4.2=py310h981052a_1
   - scipy=1.14.1=py310hfcf56fc_2
-  - setuptools=75.6.0=pyhff2d567_1
+  - setuptools=75.8.0=pyhff2d567_0
   - six=1.17.0=pyhd8ed1ab_0
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
   - sortedcontainers=2.4.0=pyhd8ed1ab_0
@@ -162,20 +162,20 @@ dependencies:
   - tblib=3.0.0=pyhd8ed1ab_1
   - threadpoolctl=3.3.0=pyhc1e730c_0
   - tk=8.6.13=noxft_h4845f30_101
-  - toml=0.10.2=pyhd8ed1ab_0
+  - toml=0.10.2=pyhd8ed1ab_1
   - tomli=2.2.1=pyhd8ed1ab_1
   - tomlkit=0.13.2=pyha770c72_1
   - toolz=1.0.0=pyhd8ed1ab_1
   - tornado=6.4.2=py310ha75aee5_0
-  - tqdm=4.67.1=pyhd8ed1ab_0
+  - tqdm=4.67.1=pyhd8ed1ab_1
   - trimesh=4.1.8=pyhd8ed1ab_0
   - typing-extensions=4.12.2=hd8ed1ab_1
   - typing_extensions=4.12.2=pyha770c72_1
   - tzdata=2024b=hc8b5060_0
-  - unicodedata2=15.1.0=py310ha75aee5_1
-  - urllib3=2.2.3=pyhd8ed1ab_1
+  - unicodedata2=16.0.0=py310ha75aee5_0
+  - urllib3=2.3.0=pyhd8ed1ab_0
   - wheel=0.45.1=pyhd8ed1ab_1
-  - xorg-libxau=1.0.11=hb9d3cd8_1
+  - xorg-libxau=1.0.12=hb9d3cd8_0
   - xorg-libxdmcp=1.1.5=hb9d3cd8_0
   - yaml=0.2.5=h7f98852_2
   - zarr=2.14.2=pyhd8ed1ab_0
@@ -184,12 +184,12 @@ dependencies:
   - zstandard=0.23.0=py310ha39cb0e_1
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
-      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@ee7fbd119f62a71ad1eb7380421f2cccb9e52477
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fe9db0338ad1f77427f1e5e64bf49356d0c14c18
-      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@59133afc4586f2924236098f5f001d402f162667
-      - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@e2192866e360874ba072231c677b6f0daf5154fd
-      - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@644febfba1e81b1777a8ebf86744541c8e1fce09
-      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@3319cb4d23738ef481f00b5ce9f1dbdcbde2ef94
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@007da1d142502378a4da9b7760c6b178986368a3
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@abdd3bd275deba6a92d741674053a9aabcccbeba
+      - mira-simpeg @ git+https://github.com/MiraGeoscience/simpeg.git@cdc4c59d47c03e1623d538504317595fcc548163
+      - octree-creation-app @ git+https://github.com/MiraGeoscience/octree-creation-app.git@065db6be99def82cb5476cdeca78afd2ea5a3a43
+      - param-sweeps @ git+https://github.com/MiraGeoscience/param-sweeps.git@dbb6a6e2131f4fb6ab26ffe0dcd1bd8adbbbd74d
+      - simpeg-drivers @ git+https://github.com/MiraGeoscience/simpeg-drivers.git@b962dfa56b08c66dc09a666050f80da83d76e450
 
 variables:
   KMP_WARNINGS: 0