Merge pull request #95 from MiraGeoscience/merge_release_to_develop

Merge release to develop

.pre-commit-config.yaml

@@ -12,12 +12,12 @@ ci:
 
 repos:
 -   repo: https://github.com/hadialqattan/pycln
-    rev: v2.4.0
+    rev: v2.5.0
     hooks:
     -   id: pycln
         args: [--config=pyproject.toml]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.9.1
     hooks:
     -   id: ruff
         args:
@@ -26,7 +26,7 @@ repos:
 #        -   --unsafe-fixes
     -   id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.13.0
+    rev: v1.14.1
     hooks:
     -   id: mypy
         additional_dependencies: [
@@ -43,10 +43,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

@@ -1,6 +1,6 @@
 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

@@ -335,4 +335,4 @@ Here is a suggestion for some plugins you can install in PyCharm.
 
 Copyright
 ^^^^^^^^^
-Copyright (c) 2024 Mira Geoscience Ltd.
+Copyright (c) 2024-2025 Mira Geoscience Ltd.

README.rst

@@ -184,4 +184,4 @@ Third Party Software notices and/or additional terms and conditions are located
 
 Copyright
 ^^^^^^^^^
-Copyright (c) 2024 Mira Geoscience Ltd.
+Copyright (c) 2024-2025 Mira Geoscience Ltd.

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

@@ -9,177 +9,179 @@ dependencies:
   - _libgcc_mutex=0.1=conda_forge
   - _openmp_mutex=4.5=2_gnu
   - alabaster=0.7.16=pyhd8ed1ab_0
-  - annotated-types=0.7.0=pyhd8ed1ab_0
+  - annotated-types=0.7.0=pyhd8ed1ab_1
   - aom=3.9.1=hac33072_0
-  - astroid=3.3.5=py310hff52083_0
-  - babel=2.16.0=pyhd8ed1ab_0
-  - blosc=1.21.6=hef167b5_0
+  - astroid=3.3.8=py310hff52083_0
+  - babel=2.16.0=pyhd8ed1ab_1
+  - blosc=1.21.6=he440d0b_1
   - brotli=1.1.0=hb9d3cd8_2
   - brotli-bin=1.1.0=hb9d3cd8_2
   - brotli-python=1.1.0=py310hf71b8c6_2
   - brunsli=0.1=h9c3ff4c_0
   - bzip2=1.0.8=h4bc722e_7
-  - c-ares=1.34.3=heb4867d_0
-  - c-blosc2=2.15.1=hc57e6cf_0
-  - ca-certificates=2024.8.30=hbcca054_0
+  - c-ares=1.34.4=hb9d3cd8_0
+  - c-blosc2=2.15.2=h3122c55_1
+  - 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
   - charls=2.4.2=h59595ed_0
-  - charset-normalizer=3.4.0=pyhd8ed1ab_0
-  - click=8.1.7=unix_pyh707e725_0
-  - cloudpickle=3.1.0=pyhd8ed1ab_1
-  - colorama=0.4.6=pyhd8ed1ab_0
-  - coverage=7.6.7=py310h89163eb_0
-  - cytoolz=1.0.0=py310ha75aee5_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
+  - coverage=7.6.10=py310h89163eb_0
+  - cytoolz=1.0.1=py310ha75aee5_0
   - dask-core=2024.6.2=pyhd8ed1ab_0
   - dav1d=1.2.1=hd590300_0
-  - dill=0.3.9=pyhd8ed1ab_0
+  - dill=0.3.9=pyhd8ed1ab_1
   - distributed=2024.6.2=pyhd8ed1ab_0
   - docutils=0.19=py310hff52083_1
-  - exceptiongroup=1.2.2=pyhd8ed1ab_0
+  - exceptiongroup=1.2.2=pyhd8ed1ab_1
   - freetype=2.12.1=h267a509_2
-  - fsspec=2024.10.0=pyhff2d567_0
+  - fsspec=2024.12.0=pyhd8ed1ab_0
   - giflib=5.2.2=hd590300_0
-  - h2=4.1.0=pyhd8ed1ab_0
-  - h5py=3.12.1=nompi_py310h60e0fe6_102
-  - hdf5=1.14.3=nompi_hdf9ad27_105
-  - hpack=4.0.0=pyh9f0ad1d_0
-  - hyperframe=6.0.1=pyhd8ed1ab_0
-  - idna=3.10=pyhd8ed1ab_0
-  - imagecodecs=2024.9.22=py310hdbe5077_0
-  - imageio=2.36.0=pyh12aca89_1
+  - h2=4.1.0=pyhd8ed1ab_1
+  - 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
+  - icu=75.1=he02047a_0
+  - idna=3.10=pyhd8ed1ab_1
+  - imagecodecs=2024.12.30=py310h78a9a29_0
+  - imageio=2.36.1=pyh12aca89_1
   - imagesize=1.4.1=pyhd8ed1ab_0
-  - importlib-metadata=8.5.0=pyha770c72_0
-  - importlib_metadata=8.5.0=hd8ed1ab_0
-  - iniconfig=2.0.0=pyhd8ed1ab_0
-  - isort=5.13.2=pyhd8ed1ab_0
-  - jinja2=3.1.4=pyhd8ed1ab_0
+  - importlib-metadata=8.5.0=pyha770c72_1
+  - importlib_metadata=8.5.0=hd8ed1ab_1
+  - iniconfig=2.0.0=pyhd8ed1ab_1
+  - isort=5.13.2=pyhd8ed1ab_1
+  - jinja2=3.1.5=pyhd8ed1ab_0
   - jxrlib=1.1=hd590300_3
   - keyutils=1.6.1=h166bdaf_0
   - krb5=1.21.3=h659f571_0
-  - lazy-loader=0.4=pyhd8ed1ab_1
-  - lazy_loader=0.4=pyhd8ed1ab_1
+  - lazy-loader=0.4=pyhd8ed1ab_2
+  - lazy_loader=0.4=pyhd8ed1ab_2
   - lcms2=2.16=hb7c19ff_0
   - ld_impl_linux-64=2.43=h712a8e2_2
   - lerc=4.0.0=h27087fc_0
   - libaec=1.1.3=h59595ed_0
   - libavif16=1.1.1=h1909e37_2
-  - libblas=3.9.0=25_linux64_openblas
+  - libblas=3.9.0=26_linux64_openblas
   - libbrotlicommon=1.1.0=hb9d3cd8_2
   - libbrotlidec=1.1.0=hb9d3cd8_2
   - libbrotlienc=1.1.0=hb9d3cd8_2
-  - libcblas=3.9.0=25_linux64_openblas
-  - libcurl=8.10.1=hbbe4b11_0
-  - libdeflate=1.22=hb9d3cd8_0
-  - libedit=3.1.20191231=he28a2e2_2
+  - libcblas=3.9.0=26_linux64_openblas
+  - libcurl=8.11.1=h332b0f4_0
+  - libdeflate=1.23=h4ddbbb0_0
+  - libedit=3.1.20240808=pl5321h7949ede_0
   - libev=4.33=hd590300_2
   - libffi=3.4.2=h7f98852_5
   - libgcc=14.2.0=h77fa898_1
   - libgcc-ng=14.2.0=h69a702a_1
   - libgfortran=14.2.0=h69a702a_1
-  - libgfortran-ng=14.2.0=h69a702a_1
   - libgfortran5=14.2.0=hd5240d6_1
   - libgomp=14.2.0=h77fa898_1
   - libhwy=1.1.0=h00ab1b0_0
+  - libiconv=1.17=hd590300_2
   - libjpeg-turbo=3.0.0=hd590300_1
-  - libjxl=0.11.0=hdb8da77_2
-  - liblapack=3.9.0=25_linux64_openblas
+  - libjxl=0.11.1=hdb8da77_0
+  - liblapack=3.9.0=26_linux64_openblas
+  - liblzma=5.6.3=hb9d3cd8_1
   - libnghttp2=1.64.0=h161d5f1_0
   - libnsl=2.0.1=hd590300_0
   - libopenblas=0.3.28=pthreads_h94d23a6_1
-  - libpng=1.6.44=hadc24fc_0
-  - libsqlite=3.47.0=hadc24fc_1
-  - libssh2=1.11.0=h0841786_0
+  - libpng=1.6.45=h943b412_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=he137b08_1
+  - 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=h8d12d68_1
   - libzlib=1.3.1=hb9d3cd8_2
   - libzopfli=1.0.3=h9c3ff4c_0
   - locket=1.0.0=pyhd8ed1ab_0
-  - lz4-c=1.9.4=hcb278e6_0
-  - markupsafe=3.0.2=py310h89163eb_0
-  - mccabe=0.7.0=pyhd8ed1ab_0
+  - lz4-c=1.10.0=h5888daf_1
+  - markupsafe=3.0.2=py310h89163eb_1
+  - mccabe=0.7.0=pyhd8ed1ab_1
   - msgpack-python=1.1.0=py310h3788b33_0
-  - ncurses=6.5=he02047a_1
+  - ncurses=6.5=h2d0b736_2
   - networkx=3.4.2=pyh267e887_2
   - numpy=1.26.4=py310hb13e2d6_0
-  - openjpeg=2.5.2=h488ebb8_0
-  - openssl=3.4.0=hb9d3cd8_0
-  - packaging=24.2=pyhff2d567_1
+  - openjpeg=2.5.3=h5fbd93e_0
+  - openssl=3.4.0=h7b32b05_1
+  - packaging=24.2=pyhd8ed1ab_2
   - partd=1.4.2=pyhd8ed1ab_0
   - pillow=10.3.0=py310hebfe307_1
-  - pip=24.3.1=pyh8b19718_0
-  - platformdirs=4.3.6=pyhd8ed1ab_0
+  - pip=24.3.1=pyh8b19718_2
+  - platformdirs=4.3.6=pyhd8ed1ab_1
   - plotly=5.19.0=pyhd8ed1ab_0
-  - pluggy=1.5.0=pyhd8ed1ab_0
-  - psutil=6.1.0=py310ha75aee5_0
+  - pluggy=1.5.0=pyhd8ed1ab_1
+  - psutil=6.1.1=py310ha75aee5_0
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pycparser=2.22=pyhd8ed1ab_0
-  - pydantic=2.9.2=pyhd8ed1ab_0
-  - pydantic-core=2.23.4=py310h505e2c1_0
-  - pygments=2.18.0=pyhd8ed1ab_0
-  - pylint=3.3.1=pyhd8ed1ab_0
-  - pysocks=1.7.1=pyha2e5f31_6
-  - pytest=8.3.3=pyhd8ed1ab_0
-  - pytest-cov=6.0.0=pyhd8ed1ab_0
-  - python=3.10.15=h4a871b0_2_cpython
+  - pycparser=2.22=pyh29332c3_1
+  - pydantic=2.10.5=pyh3cfb1c2_0
+  - pydantic-core=2.27.2=py310h505e2c1_0
+  - pygments=2.19.1=pyhd8ed1ab_0
+  - pylint=3.3.3=pyhd8ed1ab_0
+  - pysocks=1.7.1=pyha55dd90_7
+  - pytest=8.3.4=pyhd8ed1ab_1
+  - pytest-cov=6.0.0=pyhd8ed1ab_1
+  - python=3.10.16=he725a3c_1_cpython
   - python_abi=3.10=5_cp310
-  - pytz=2024.2=pyhd8ed1ab_0
-  - pywavelets=1.7.0=py310hf462985_2
+  - pytz=2024.2=pyhd8ed1ab_1
+  - pywavelets=1.8.0=py310hf462985_0
   - pyyaml=6.0.2=py310ha75aee5_1
   - rav1e=0.6.6=he8a937b_2
   - readline=8.2=h8228510_1
-  - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_0
-  - requests=2.32.3=pyhd8ed1ab_0
+  - readthedocs-sphinx-ext=2.2.5=pyhd8ed1ab_1
+  - requests=2.32.3=pyhd8ed1ab_1
   - scikit-image=0.24.0=py310h5eaa309_3
-  - scipy=1.14.1=py310hfcf56fc_1
-  - setuptools=75.5.0=pyhff2d567_0
-  - snappy=1.2.1=ha2e4443_0
+  - scipy=1.14.1=py310hfcf56fc_2
+  - setuptools=75.8.0=pyhff2d567_0
+  - snappy=1.2.1=h8bd8927_1
   - snowballstemmer=2.2.0=pyhd8ed1ab_0
   - sortedcontainers=2.4.0=pyhd8ed1ab_0
   - sphinx=5.3.0=pyhd8ed1ab_0
-  - sphinxcontrib-applehelp=2.0.0=pyhd8ed1ab_0
-  - sphinxcontrib-devhelp=2.0.0=pyhd8ed1ab_0
-  - sphinxcontrib-htmlhelp=2.1.0=pyhd8ed1ab_0
-  - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_0
-  - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_0
-  - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_0
+  - sphinxcontrib-applehelp=2.0.0=pyhd8ed1ab_1
+  - sphinxcontrib-devhelp=2.0.0=pyhd8ed1ab_1
+  - sphinxcontrib-htmlhelp=2.1.0=pyhd8ed1ab_1
+  - sphinxcontrib-jsmath=1.0.1=pyhd8ed1ab_1
+  - sphinxcontrib-qthelp=2.0.0=pyhd8ed1ab_1
+  - sphinxcontrib-serializinghtml=1.1.10=pyhd8ed1ab_1
   - svt-av1=2.3.0=h5888daf_0
-  - tblib=3.0.0=pyhd8ed1ab_0
-  - tenacity=9.0.0=pyhd8ed1ab_0
-  - tifffile=2024.9.20=pyhd8ed1ab_0
+  - tblib=3.0.0=pyhd8ed1ab_1
+  - tenacity=9.0.0=pyhd8ed1ab_1
+  - tifffile=2025.1.10=pyhd8ed1ab_0
   - tk=8.6.13=noxft_h4845f30_101
-  - toml=0.10.2=pyhd8ed1ab_0
-  - tomli=2.1.0=pyhff2d567_0
-  - tomlkit=0.13.2=pyha770c72_0
-  - toolz=1.0.0=pyhd8ed1ab_0
-  - tornado=6.4.1=py310ha75aee5_1
-  - tqdm=4.67.0=pyhd8ed1ab_0
-  - typing-extensions=4.12.2=hd8ed1ab_0
-  - typing_extensions=4.12.2=pyha770c72_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_1
+  - typing-extensions=4.12.2=hd8ed1ab_1
+  - typing_extensions=4.12.2=pyha770c72_1
   - tzdata=2024b=hc8b5060_0
-  - urllib3=2.2.3=pyhd8ed1ab_0
-  - wheel=0.45.0=pyhd8ed1ab_0
-  - xorg-libxau=1.0.11=hb9d3cd8_1
+  - urllib3=2.3.0=pyhd8ed1ab_0
+  - wheel=0.45.1=pyhd8ed1ab_1
+  - xorg-libxau=1.0.12=hb9d3cd8_0
   - xorg-libxdmcp=1.1.5=hb9d3cd8_0
-  - xz=5.2.6=h166bdaf_0
   - yaml=0.2.5=h7f98852_2
   - zfp=1.0.1=h5888daf_2
-  - zict=3.0.0=pyhd8ed1ab_0
-  - zipp=3.21.0=pyhd8ed1ab_0
-  - zlib-ng=2.2.2=h5888daf_0
+  - zict=3.0.0=pyhd8ed1ab_1
+  - zipp=3.21.0=pyhd8ed1ab_1
+  - zlib-ng=2.2.3=h7955e40_0
   - zstandard=0.23.0=py310ha39cb0e_1
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
-      - curve-apps @ git+https://github.com/MiraGeoscience/curve-apps.git@5d104dd0155fdf2c488311e0a05fe3e14cc69fb4
-      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@2a9d77a577fadf9c1256b0385e588e499f7f0dcf
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@c1e326fc443a0fa1640084053c62dac78cf7472d
+      - curve-apps @ git+https://github.com/MiraGeoscience/curve-apps.git@cdd2459e904d335047d302478b4c115a98f74bd3
+      - geoapps-utils @ git+https://github.com/MiraGeoscience/geoapps-utils.git@007da1d142502378a4da9b7760c6b178986368a3
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@abdd3bd275deba6a92d741674053a9aabcccbeba
 
 variables:
   KMP_WARNINGS: 0