Merge pull request #118 from MiraGeoscience/GEOPY-2809

GEOPY-2809: Python env for Analyst on current packages from develop

Author: sebhmg

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 
 default_language_version:
-    python: python3
+    python: python3.12
 exclude: ^docs/(source/conf.py|_ext/)
 default_stages: [pre-commit,pre-push]
 fail_fast: false
@@ -12,7 +12,7 @@ ci:
 
 repos:
 -   repo: https://github.com/python-poetry/poetry
-    rev: 2.1.3
+    rev: 2.4.1
     hooks:
     -   id: poetry-check
         args: [--lock, --no-plugins]
@@ -22,7 +22,7 @@ repos:
     -   id: pycln
         args: [--config=pyproject.toml]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.9
+    rev: v0.15.15
     hooks:
     -   id: ruff-check
         args:
@@ -31,7 +31,7 @@ repos:
 #        -   --unsafe-fixes
     -   id: ruff-format
 -   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.17.1
+    rev: v2.1.0
     hooks:
     -   id: mypy
         additional_dependencies: [
@@ -65,7 +65,7 @@ repos:
         types: [python]
         exclude: ^(devtools|docs|las_geoh5-assets)/
 -   repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.2
     hooks:
     -   id: codespell
         exclude: (\.lock|\.ipynb|^THIRD_PARTY_SOFTWARE\.rst)$

poetry.lock

@@ -72,8 +72,8 @@ tqdm = "^4.66.1"
 
 ## dependencies from Git repositories
 #------------------------------------
-#geoh5py = {version = ">=0.12.0b5, <0.13.dev", allow-prereleases = true}
-geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "release/GA_4.8"}
+geoh5py = {version = ">=0.13.0b1, 0.13.*", allow-prereleases = true}
+# geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "release/GA_4.8"}
 #geoh5py = {path = "../geoh5py", develop = true}
 
 [tool.poetry.group.dev.dependencies]

pyproject.toml

@@ -29,12 +29,10 @@ requirements:
     - python ${{ python_min }}.*
     - poetry-core >=1.8.0
     - poetry-dynamic-versioning >=1.9, 1.*
-    - setuptools
-    - setuptools_scm
   run:
     - python >=${{ python_min }}
     # Mira packages
-    - geoh5py >=0.13.0a2, 0.13.*
+    - geoh5py >=0.13.0b1, 0.13.*
     # direct dependencies
     - lasio 0.32.*
     - numpy >=2.4.0, 2.4.*
@@ -43,6 +41,7 @@ requirements:
 
 tests:
   - python:
+      python_version: ${{ python_min }}.*
       imports:
         - ${{ module_name }}
         - ${{ module_name }}._version
@@ -74,4 +73,6 @@ about:
 extra:
   recipe-maintainers:
     - andrewg-mira
+    - domfournier
+    - RomFloreani
     - sebhmg

recipe.yaml

@@ -49,7 +49,7 @@ def test_get_depths():
     assert "from-to" in depths and len(depths) == 1
     assert np.allclose(depths["from-to"], np.c_[np.arange(0, 10), np.arange(1, 11)])
     lasfile = lasio.LASFile()
-    with pytest.raises(ValueError, match="curve named 'DEPTH' or 'DEPT'."):
+    with pytest.raises(ValueError, match=r"curve named 'DEPTH' or 'DEPT'\."):
         get_depths(lasfile)
 
 

tests/geoh5_to_las_test.py

@@ -226,15 +226,15 @@ def test_las_translator_retrieve(tmp_path: Path):
     assert translator.retrieve("well_name", lasfile) == "dh1"
 
     with pytest.raises(
-        KeyError, match="'collar_z_name' field: 'ELEV' not found in LAS file."
+        KeyError, match=r"'collar_z_name' field: 'ELEV' not found in LAS file\."
     ):
         translator.retrieve("collar_z_name", lasfile)
 
 
 def test_las_translator_translate():
     translator = LASTranslator(NameOptions(collar_x_name="UTMX"))
     assert translator.translate("collar_x_name") == "UTMX"
-    with pytest.raises(KeyError, match="'not_a_field' is not a recognized field."):
+    with pytest.raises(KeyError, match=r"'not_a_field' is not a recognized field\."):
         translator.translate("not_a_field")
 
 

tests/import_las_test.py

@@ -28,7 +28,7 @@
 @pytest.fixture(scope="module", name="input_workspace")
 def input_workspace_fixture(tmp_path_factory) -> Workspace:
     tmp_path = tmp_path_factory.mktemp("input")
-    with Workspace.create(tmp_path / "my workspace") as workspace:
+    with Workspace.create(tmp_path / "my workspace.geoh5") as workspace:
         return workspace