Merge branch 'develop' into GEOPY-2715

# Conflicts:
#	environments/py-3.12-linux-64-dev.conda.lock.yml
#	environments/py-3.12-linux-64.conda.lock.yml
#	environments/py-3.12-win-64-dev.conda.lock.yml
#	environments/py-3.12-win-64.conda.lock.yml
#	environments/py-3.13-linux-64-dev.conda.lock.yml
#	environments/py-3.13-linux-64.conda.lock.yml
#	environments/py-3.13-win-64-dev.conda.lock.yml
#	environments/py-3.13-win-64.conda.lock.yml
#	environments/py-3.14-linux-64-dev.conda.lock.yml
#	environments/py-3.14-linux-64.conda.lock.yml
#	environments/py-3.14-win-64-dev.conda.lock.yml
#	environments/py-3.14-win-64.conda.lock.yml
#	py-3.12.conda-lock.yml
#	py-3.13.conda-lock.yml
#	py-3.14.conda-lock.yml

Author: domfournier

.github/workflows/security_scan.yml

@@ -24,7 +24,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  call-workflow-zizmor-annotate:
+  call-workflow-zizmor-advanced-security:
     name: Zizmor analysis (advanced security)
     if: ${{ github.event_name != 'pull_request' }}
     permissions:
@@ -33,7 +33,7 @@ jobs:
       actions: read
     uses: MiraGeoscience/CI-tools/.github/workflows/reusable-zizmor-advanced-security.yml@v2
 
-  call-workflow-zizmor-advanced-security:
+  call-workflow-zizmor-annotate:
     name: Zizmor analysis (annotate)
     if: ${{ github.event_name == 'pull_request' }}
     permissions:

.pre-commit-config.yaml

@@ -22,7 +22,7 @@ repos:
     -   id: pycln
         args: [--config=pyproject.toml]
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.4
+    rev: v0.15.2
     hooks:
     -   id: ruff-check
         args:

pyproject.toml

@@ -74,11 +74,11 @@ include = [
 version = "0.0.0.dev0"
 
 [tool.poetry.dependencies]
-# note: py-deps-clock defines custom mapping from dask to dask-core
+# note: py-deps-lock defines custom mapping from dask to dask-core
 dask = "~2025.3.0"  # also in simpeg[dask]
 discretize = "~0.12.0"  # also in simpeg, grid-apps
 distributed = "~2025.3.0"  # for dask[distributed]
-matplotlib-base = ">=3.10.0, <3.11.dev"  # from geoapps-utils
+matplotlib-base = "~3.10.0"  # from geoapps-utils
 numpy = "~2.4.2"
 openpyxl = ">=3.1.2"
 pandas = ">=3.0.*"
@@ -93,16 +93,16 @@ trimesh = "~4.1.3"
 
 ## Pip dependencies from Git repositories
 #----------------------------------------
-#geoh5py = {version = ">=0.13.0a, 0.13.*", source = "pypi", allow-prereleases = true}
+#geoh5py = {version = ">=0.13.0a2, 0.13.*", source = "pypi", allow-prereleases = true}
 geoh5py = {git = "https://github.com/MiraGeoscience/geoh5py.git", rev = "develop"}
 
-#grid-apps = {version = ">=0.2.0a, 0.2.*", source = "pypi", allow-prereleases = true}
+#grid-apps = {version = ">=0.2.0a2, 0.2.*", source = "pypi", allow-prereleases = true}
 grid-apps = {git = "https://github.com/MiraGeoscience/grid-apps.git", rev = "develop"}
 
-#geoapps-utils = {version = ">=0.7.0a, 0.7.*", source = "pypi", allow-prereleases = true}
+#geoapps-utils = {version = ">=0.7.0a2, 0.7.*", source = "pypi", allow-prereleases = true}
 geoapps-utils = {git = "https://github.com/MiraGeoscience/geoapps-utils.git", rev = "develop"}
 
-#mira-simpeg = {version = ">=0.23.0.3a, 0.23.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]}
+#mira-simpeg = {version = ">=0.23.0.2, 0.23.0.* || >=0.25.0.1a, 0.25.0.*", source="pypi", allow-prereleases = true, extras = ["dask"]}
 mira-simpeg = {git = "https://github.com/MiraGeoscience/simpeg.git", rev = "develop", extras = ["dask"]}
 
 ## about pip dependencies
@@ -141,8 +141,8 @@ libblas = "*=*mkl"  # because simpeg already brings in the MKL
 bokeh = "3.6.*"   # optional, for dask reporting
 fsspec = ">=2022.0"  # from simpeg[dask]
 geoana = "0.8.*"  # from simpeg
-h5py = ">=3.15.1, <4.0.dev"  # from geoh5py
-pillow = ">=12.1.0, <13.0.dev"  # from geoh5py
+h5py = ">=3.15.1, 3.*"  # from geoh5py
+pillow = ">=12.1.0, 12.*"  # from geoh5py
 pymatsolver = "0.3.*"  # from simpeg
 zarr = ">=2.14.2, 2.14.*"  # from simpeg[dask]
 

recipe.yaml

@@ -20,25 +20,25 @@ build:
 
 requirements:
   host:
-    - python 3.12.*
+    - python ${{ python_min }}.*
     - poetry-core >=1.8.0
     - poetry-dynamic-versioning >=1.9, 1.*
     - setuptools
     - pip
   run:
     - python >=${{ python_min }}
     # Mira packages
-    - geoapps-utils >=0.7.0a, 0.7.*
-    - geoh5py >=0.13.0a, 0.13.*
-    - grid-apps >=0.2.0a, 0.2.*
-    - mira-simpeg >=0.23.0.3a, 0.23.0.*
+    - geoapps-utils >=0.7.0a2, 0.7.*
+    - geoh5py >=0.13.0a2, 0.13.*
+    - grid-apps >=0.2.0a2, 0.2.*
+    - mira-simpeg >=0.23.0.2, 0.23.0.* | >=0.25.0.1a, 0.25.0.*
 
     # direct dependencies
     - dask-core 2025.3.*
     - discretize 0.12.*
     - distributed 2025.3.*
     - numpy >=2.4.2, 2.4.*
-    - pydantic >=2.12.0, 2.12.*
+    - pydantic 2.12.*
     - pydiso 0.2.*
     - python-mumps >=0.0.6, 0.0.6.*
     - rtree 1.4.*

simpeg_drivers/options.py

@@ -11,7 +11,7 @@
 
 from __future__ import annotations
 
-from enum import Enum
+from enum import StrEnum
 from logging import getLogger
 from pathlib import Path
 from typing import Annotated, Any, ClassVar, Literal
@@ -321,7 +321,7 @@ def gradient_orientations(self) -> tuple(float, float):
         return self._gradient_orientations
 
 
-class ModelTypeEnum(str, Enum):
+class ModelTypeEnum(StrEnum):
     conductivity = "Conductivity (S/m)"
     resistivity = "Resistivity (Ohm-m)"