move regionmaskcompat to core (#275)

MESMER-group · Sep 4, 2023 · 4b66b70 · 4b66b70
1 parent 4e2b408
commit 4b66b70
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/mesmer/core/mask.py b/mesmer/core/mask.py
@@ -2,7 +2,7 @@
 import regionmask
 import xarray as xr
 
-import mesmer.utils
+import mesmer
 
 
 def _where_if_dim(obj, cond, dims):
@@ -56,10 +56,10 @@ def mask_ocean_fraction(data, threshold, *, x_coords="lon", y_coords="lat"):
     land_110 = regionmask.defined_regions.natural_earth_v5_0_0.land_110
 
     try:
-        mask_fraction = mesmer.utils.regionmaskcompat.mask_3D_frac_approx(
+        mask_fraction = mesmer.core.regionmaskcompat.mask_3D_frac_approx(
             land_110, data[x_coords], data[y_coords]
         )
-    except mesmer.utils.regionmaskcompat.InvalidCoordsError as e:
+    except mesmer.core.regionmaskcompat.InvalidCoordsError as e:
         raise ValueError(
             "Cannot calculate fractional mask for irregularly-spaced coords - use "
             "``mask_land`` instead."

diff --git a/mesmer/utils/regionmaskcompat.py → mesmer/core/regionmaskcompat.py b/mesmer/utils/regionmaskcompat.py → mesmer/core/regionmaskcompat.py
diff --git a/mesmer/io/load_constant_files.py b/mesmer/io/load_constant_files.py
@@ -16,7 +16,7 @@
 import regionmask
 from packaging.version import Version
 
-from ..utils.regionmaskcompat import mask_3D_frac_approx
+from ..core.regionmaskcompat import mask_3D_frac_approx
 
 
 def load_phi_gc(lon, lat, ls, cfg, L_start=1500, L_end=10000, L_interval=250):

diff --git a/tests/unit/test_regionmaskcompat.py b/tests/unit/test_regionmaskcompat.py
@@ -4,7 +4,7 @@
 import shapely.geometry
 import xarray as xr
 
-from mesmer.utils.regionmaskcompat import (
+from mesmer.core.regionmaskcompat import (
     InvalidCoordsError,
     mask_3D_frac_approx,
     sample_coord,