Merge pull request #63 from sebhmg/develop

DEVOPS-515: merge release prep branch to develop

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 default_language_version:
     python: python3
 exclude: ^docs/(source/conf.py|_ext/)
-default_stages: [commit,push]
+default_stages: [pre-commit,pre-push]
 fail_fast: false
 
 ci:
@@ -22,7 +22,7 @@ repos:
     -   id: pycln
         args: [--config=pyproject.toml]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.5.5
+    rev: v0.6.9
     hooks:
     -   id: ruff
         args:
@@ -31,7 +31,7 @@ repos:
 #        -   --unsafe-fixes
     -   id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.11.0
+    rev: v1.12.0
     hooks:
     -   id: mypy
         additional_dependencies: [
@@ -42,7 +42,7 @@ repos:
         ]
         exclude: ^(docs|las_geoh5-assets)/
 -   repo: https://github.com/codingjoe/relint
-    rev: 3.1.1
+    rev: 3.2.0
     hooks:
     -   id: relint
         args: [-W]  # to fail on warnings
@@ -70,7 +70,7 @@ repos:
         exclude: (\.lock|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$
         entry: codespell -I .codespellignore
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     -   id: trailing-whitespace
         exclude: \.mdj$

las_geoh5/export_las.py

@@ -79,8 +79,8 @@ def add_curve_data(file: LASFile, drillhole: Drillhole, group):
 
         file.append_curve(datum.name, datum.values)
 
-        if isinstance(datum, ReferencedData):
-            for k, v in datum.value_map.map.items():  # pylint: disable=invalid-name
+        if isinstance(datum, ReferencedData) and datum.value_map is not None:
+            for k, v in datum.value_map().items():  # pylint: disable=invalid-name
                 file.params.append(
                     HeaderItem(
                         mnemonic=f"{datum.name} ({k})", value=v, descr="REFERENCE"

las_geoh5/import_las.py

@@ -292,6 +292,7 @@ def create_or_append_drillhole(
     lasfile: lasio.LASFile,
     drillhole_group: DrillholeGroup,
     group_name: str,
+    *,
     translator: LASTranslator | None = None,
     collocation_tolerance: float = 0.01,
     logger: logging.Logger | None = None,
@@ -354,6 +355,7 @@ def las_to_drillhole(
     data: lasio.LASFile | list[lasio.LASFile],
     drillhole_group: DrillholeGroup,
     property_group: str,
+    *,
     surveys: Path | list[Path] | None = None,
     logger: logging.Logger | None = None,
     options: ImportOptions | None = None,

pyproject.toml

@@ -53,8 +53,8 @@ tqdm = "^4.66.1"
 
 ## dependencies from Git repositories
 #------------------------------------
-geoh5py = {version = ">=0.9.1, <0.11", allow-prereleases = true}
-#geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"}
+#geoh5py = {version = ">=0.9.1, <0.11", allow-prereleases = true}
+geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "release/0.10.0"}
 #geoh5py = {path = "../geoh5py", develop = true}
 
 [tool.poetry.group.dev.dependencies]

tests/geoh5_to_las_test.py

@@ -14,7 +14,7 @@
 import lasio
 import numpy as np
 import pytest
-from geoh5py.groups.drillhole_group import DrillholeGroup
+from geoh5py.groups.drillhole import DrillholeGroup
 from geoh5py.objects.drillhole import Drillhole
 from geoh5py.shared.utils import compare_entities
 from geoh5py.workspace import Workspace

tests/helpers.py

@@ -52,6 +52,7 @@ def write_import_params_file(
     property_group_name: str,
     files: list[Path],
     collar_xyz_names: tuple[str, str, str],
+    *,
     skip_empty_header=False,
 ) -> Path:
     workspace = drillhole_group.workspace