Merge pull request #106 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.8.1
+    rev: v0.9.0
     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.0.2
     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) 2023-2024 Mira Geoscience
+Copyright (c) 2023-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) 2023-2024 Mira Geoscience Ltd.
+Copyright (c) 2023-2025 Mira Geoscience Ltd.

README.rst

@@ -171,4 +171,4 @@ SOFTWARE.
 
 Copyright
 ^^^^^^^^^
-Copyright (c) 2023-2024 Mira Geoscience Ltd.
+Copyright (c) 2023-2025 Mira Geoscience Ltd.

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

@@ -9,33 +9,33 @@ dependencies:
   - _libgcc_mutex=0.1=conda_forge
   - _openmp_mutex=4.5=2_gnu
   - annotated-types=0.7.0=pyhd8ed1ab_1
-  - astroid=3.3.5=py310hff52083_0
+  - astroid=3.3.8=py310hff52083_0
   - 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
   - colorama=0.4.6=pyhd8ed1ab_1
-  - coverage=7.6.8=py310h89163eb_0
+  - coverage=7.6.10=py310h89163eb_0
   - dill=0.3.9=pyhd8ed1ab_1
   - exceptiongroup=1.2.2=pyhd8ed1ab_1
   - freetype=2.12.1=h267a509_2
-  - h5py=3.12.1=nompi_py310h60e0fe6_102
-  - hdf5=1.14.3=nompi_h2d575fe_107
+  - h5py=3.12.1=nompi_py310hacc6608_103
+  - hdf5=1.14.4=nompi_h2d575fe_105
   - iniconfig=2.0.0=pyhd8ed1ab_1
   - isort=5.13.2=pyhd8ed1ab_1
-  - jinja2=3.1.4=pyhd8ed1ab_1
+  - jinja2=3.1.5=pyhd8ed1ab_0
   - keyutils=1.6.1=h166bdaf_0
   - krb5=1.21.3=h659f571_0
   - 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
-  - libblas=3.9.0=25_linux64_openblas
-  - libcblas=3.9.0=25_linux64_openblas
-  - libcurl=8.10.1=hbbe4b11_0
-  - libdeflate=1.22=hb9d3cd8_0
-  - libedit=3.1.20191231=he28a2e2_2
+  - libblas=3.9.0=26_linux64_openblas
+  - 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
@@ -44,60 +44,60 @@ dependencies:
   - libgfortran5=14.2.0=hd5240d6_1
   - libgomp=14.2.0=h77fa898_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=25_linux64_openblas
+  - 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
+  - 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=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
   - libzlib=1.3.1=hb9d3cd8_2
   - markupsafe=3.0.2=py310h89163eb_1
   - mccabe=0.7.0=pyhd8ed1ab_1
   - ncurses=6.5=he02047a_1
   - numpy=1.26.4=py310hb13e2d6_0
-  - openjpeg=2.5.2=h488ebb8_0
-  - openssl=3.4.0=hb9d3cd8_0
+  - openjpeg=2.5.3=h5fbd93e_0
+  - openssl=3.4.0=h7b32b05_1
   - packaging=24.2=pyhd8ed1ab_2
   - 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
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pydantic=2.10.3=pyh3cfb1c2_0
-  - pydantic-core=2.27.1=py310h505e2c1_0
-  - pygments=2.18.0=pyhd8ed1ab_1
-  - pylint=3.3.2=pyhd8ed1ab_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
   - 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
   - pyyaml=6.0.2=py310ha75aee5_1
   - readline=8.2=h8228510_1
-  - scipy=1.14.1=py310hfcf56fc_1
-  - setuptools=75.6.0=pyhff2d567_1
+  - scipy=1.14.1=py310hfcf56fc_2
+  - setuptools=75.8.0=pyhff2d567_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
   - typing-extensions=4.12.2=hd8ed1ab_1
   - typing_extensions=4.12.2=pyha770c72_1
   - tzdata=2024b=hc8b5060_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
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fe9db0338ad1f77427f1e5e64bf49356d0c14c18
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@abdd3bd275deba6a92d741674053a9aabcccbeba
 
 variables:
   KMP_WARNINGS: 0

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

@@ -10,24 +10,24 @@ dependencies:
   - _openmp_mutex=4.5=2_gnu
   - annotated-types=0.7.0=pyhd8ed1ab_1
   - 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
   - freetype=2.12.1=h267a509_2
-  - h5py=3.12.1=nompi_py310h60e0fe6_102
-  - hdf5=1.14.3=nompi_h2d575fe_107
+  - h5py=3.12.1=nompi_py310hacc6608_103
+  - hdf5=1.14.4=nompi_h2d575fe_105
   - keyutils=1.6.1=h166bdaf_0
   - krb5=1.21.3=h659f571_0
   - 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
-  - libblas=3.9.0=25_linux64_openblas
-  - libcblas=3.9.0=25_linux64_openblas
-  - libcurl=8.10.1=hbbe4b11_0
-  - libdeflate=1.22=hb9d3cd8_0
-  - libedit=3.1.20191231=he28a2e2_2
+  - libblas=3.9.0=26_linux64_openblas
+  - 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
@@ -36,46 +36,46 @@ dependencies:
   - libgfortran5=14.2.0=hd5240d6_1
   - libgomp=14.2.0=h77fa898_1
   - libjpeg-turbo=3.0.0=hd590300_1
-  - liblapack=3.9.0=25_linux64_openblas
+  - 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
+  - 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=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
   - libzlib=1.3.1=hb9d3cd8_2
   - ncurses=6.5=he02047a_1
   - numpy=1.26.4=py310hb13e2d6_0
-  - openjpeg=2.5.2=h488ebb8_0
-  - openssl=3.4.0=hb9d3cd8_0
+  - openjpeg=2.5.3=h5fbd93e_0
+  - openssl=3.4.0=h7b32b05_1
   - pillow=10.3.0=py310hebfe307_1
-  - pip=24.3.1=pyh8b19718_0
+  - pip=24.3.1=pyh8b19718_2
   - pthread-stubs=0.4=hb9d3cd8_1002
-  - pydantic=2.10.3=pyh3cfb1c2_0
-  - pydantic-core=2.27.1=py310h505e2c1_0
+  - pydantic=2.10.5=pyh3cfb1c2_0
+  - pydantic-core=2.27.2=py310h505e2c1_0
   - python=3.10.16=he725a3c_1_cpython
   - python_abi=3.10=5_cp310
   - readline=8.2=h8228510_1
-  - scipy=1.14.1=py310hfcf56fc_1
-  - setuptools=75.6.0=pyhff2d567_1
+  - scipy=1.14.1=py310hfcf56fc_2
+  - setuptools=75.8.0=pyhff2d567_0
   - tk=8.6.13=noxft_h4845f30_101
   - typing-extensions=4.12.2=hd8ed1ab_1
   - typing_extensions=4.12.2=pyha770c72_1
   - tzdata=2024b=hc8b5060_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
   - zstd=1.5.6=ha6fb4c9_0
   - pip:
-      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@fe9db0338ad1f77427f1e5e64bf49356d0c14c18
+      - geoh5py @ git+https://github.com/MiraGeoscience/geoh5py.git@abdd3bd275deba6a92d741674053a9aabcccbeba
 
 variables:
   KMP_WARNINGS: 0