DEVOPS-515: requires geoh5py 0.10 + pymatsolver constraint in conda recipe

.pre-commit-config.yaml

@@ -1,17 +1,22 @@
+default_language_version:
+  python: python3
 repos:
-  - repo: https://github.com/psf/black
+  - repo: https://github.com/psf/black-pre-commit-mirror
     rev: 24.3.0
     hooks:
       - id: black
-        language_version: python3
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
-        language_version: python3
         additional_dependencies:
           - flake8-bugbear==23.12.2
           - flake8-builtins==2.2.0
           - flake8-mutable==1.2.0
           - flake8-rst-docstrings==0.3.0
           - flake8-docstrings==1.7.0
+  - repo: https://github.com/MiraGeoscience/pre-commit-hooks
+    rev: v1.0.1
+    hooks:
+      - id: prepare-commit-msg
+      - id: check-commit-msg

meta.yaml

@@ -25,11 +25,11 @@ requirements:
     - discretize >=0.10.0
     - empymod >=2.0.0
     - geoana >=0.5.0
-    - geoh5py >=0.9.1,<0.11
+    - geoh5py >=0.10.0a0.dev0, <0.11.0
     - matplotlib-base
     - numpy >=1.20
     - pandas
-    - pymatsolver >=0.2
+    - pymatsolver >=0.2.0, <0.3.0
     - scikit-learn >=1.2
     - scipy >=1.8.0
   run_constrained:

pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "discretize>=0.10.0",
     "empymod>=2.0.0",
     "geoana>=0.5.0",
-    "geoh5py>=0.9.1,<0.11",
+    "geoh5py>=0.10.0-alpha.1, <0.11",
     "matplotlib",
     "numpy>=1.20",
     "pandas",

simpeg/data.py

@@ -58,7 +58,7 @@ def __init__(
         relative_error=None,
         noise_floor=None,
         standard_deviation=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(**kwargs)
         self.survey = survey

simpeg/electromagnetics/frequency_domain/simulation.py

@@ -73,7 +73,7 @@ def __init__(
         forward_only=False,
         permittivity=None,
         storeJ=False,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, survey=survey, **kwargs)
         self.forward_only = forward_only

simpeg/electromagnetics/natural_source/simulation_1d.py

@@ -54,7 +54,7 @@ def __init__(
         thicknesses=None,
         thicknessesMap=None,
         fix_Jmatrix=False,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=None, survey=survey, **kwargs)
         self.fix_Jmatrix = fix_Jmatrix

simpeg/electromagnetics/static/induced_polarization/simulation.py

@@ -70,7 +70,7 @@ def __init__(
         etaMap=None,
         Ainv=None,  # A DC's Ainv
         _f=None,  # A pre-computed DC field
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, survey=survey, **kwargs)
         self.sigma = sigma

simpeg/electromagnetics/static/self_potential/simulation.py

@@ -64,7 +64,7 @@ def __init__(
             rho=rho,
             sigmaMap=None,
             rhoMap=None,
-            **kwargs
+            **kwargs,
         )
         self.q = q
         self.qMap = qMap

simpeg/electromagnetics/static/spectral_induced_polarization/simulation.py

@@ -45,7 +45,7 @@ def __init__(
         storeJ=False,
         actinds=None,
         storeInnerProduct=True,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, survey=survey, **kwargs)
         self.tau = tau

simpeg/electromagnetics/static/spectral_induced_polarization/survey.py

@@ -26,7 +26,7 @@ def __init__(
         source_list=None,
         survey_geometry="surface",
         survey_type="dipole-dipole",
-        **kwargs
+        **kwargs,
     ):
         if source_list is None:
             raise AttributeError("Survey cannot be instantiated without sources")

simpeg/flow/richards/empirical.py

@@ -100,7 +100,7 @@ def __init__(
         alphaMap=None,
         beta=3.96,
         betaMap=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, **kwargs)
         self.theta_r = theta_r
@@ -224,7 +224,7 @@ def __init__(
         AMap=None,
         gamma=4.74,
         gammaMap=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, **kwargs)
         self.Ks = Ks
@@ -292,7 +292,7 @@ def haverkamp(mesh, **kwargs):
         Haverkamp_theta,
         ["Ks", "A", "gamma"],
         ["alpha", "beta", "theta_r", "theta_s"],
-        **kwargs
+        **kwargs,
     )
 
 
@@ -344,7 +344,7 @@ def __init__(
         nMap=None,
         alpha=0.036,
         alphaMap=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, **kwargs)
         self.theta_r = theta_r
@@ -499,7 +499,7 @@ def __init__(
         nMap=None,
         alpha=0.036,
         alphaMap=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(mesh=mesh, **kwargs)
         self.Ks = Ks
@@ -807,7 +807,7 @@ def van_genuchten(mesh, **kwargs):
         Vangenuchten_theta,
         ["alpha", "n", "Ks", "I"],
         ["alpha", "n", "theta_r", "theta_s"],
-        **kwargs
+        **kwargs,
     )
 
 

simpeg/flow/richards/simulation.py

@@ -33,7 +33,7 @@ def __init__(
         do_newton=False,
         root_finder_max_iter=30,
         root_finder_tol=1e-4,
-        **kwargs
+        **kwargs,
     ):
         debug = kwargs.pop("debug", None)
         if debug is not None:

simpeg/inversion.py

@@ -15,7 +15,7 @@ def __init__(
         counter=None,
         debug=False,
         name="BaseInversion",
-        **kwargs
+        **kwargs,
     ):
         if directiveList is None:
             directiveList = []

simpeg/regularization/__init__.py

@@ -200,7 +200,7 @@ def __init__(self, mesh=None, alpha_x=1.0, alpha_y=1.0, alpha_z=1.0, **kwargs):
             length_scale_x=alpha_x,
             length_scale_y=alpha_y,
             length_scale_z=alpha_z,
-            **kwargs
+            **kwargs,
         )
 
 
@@ -217,7 +217,7 @@ def __init__(
             alpha_x=alpha_x,
             alpha_y=alpha_y,
             alpha_z=alpha_z,
-            **kwargs
+            **kwargs,
         )
 
 

simpeg/utils/plot_utils.py

@@ -255,7 +255,7 @@ def hillshade(array, azimuth, angle_altitude):
             Y,
             hillshade(DATA, shade_azimuth, shade_angle_altitude),
             shade_ncontour,
-            **shadeOpts
+            **shadeOpts,
         )
 
     if dataloc:
@@ -279,7 +279,7 @@ def plot_1d_layer_model(
     plot_elevation=False,
     show_layers=False,
     vlim=None,
-    **kwargs
+    **kwargs,
 ):
     """
     Plot the vertical profile for a 1D layered Earth model.

tests/base/test_Props.py

@@ -106,7 +106,7 @@ def __init__(
         AMap=None,
         gamma=4.74,
         gammaMap=None,
-        **kwargs
+        **kwargs,
     ):
         super().__init__(**kwargs)
         self.Ks = Ks

tests/pf/test_forward_PFproblem.py

@@ -69,7 +69,7 @@ def test_ana_forward(self):
             *self.sphere_center,
             self.chiblk,
             self.b0,
-            "secondary"
+            "secondary",
         )
 
         n_obs, n_comp = self.rxLoc.shape[0], len(self.survey.components)