Merge branch 'master' of https://github.com/Loop3D/LoopStructural

Author: lachlangrose

.github/workflows/release-please.yml

@@ -37,12 +37,11 @@ jobs:
       - name: Installing dependencies
         shell: bash -l {0}
         run: |
-          conda install -c conda-forge cython numpy scipy scikit-image scikit-learn pyamg pytest networkx osqp matplotlib -y
+          conda install -c conda-forge numpy scipy scikit-image scikit-learn pytest networkx osqp matplotlib -y
       - name: Building and install
         shell: bash -l {0}
         run: |
-          python setup.py install build_ext --inplace
-          pip install .
+          pip install . --user
       - name: pytest
         shell: bash -l {0}
         run: |

LoopStructural/analysis/__init__.py

@@ -6,7 +6,7 @@
     InterpolatorFactory,
     InterpolatorType,
 )
-from LoopStructural.utils import BoundingBox
+from LoopStructural.datatypes import BoundingBox
 from LoopStructural.utils import getLogger
 
 logger = getLogger(__name__)

LoopStructural/analysis/_fault_displacement.py

@@ -11,8 +11,7 @@
     from skimage.measure import marching_cubes_lewiner as marching_cubes
 
 from LoopStructural.interpolators import GeologicalInterpolator
-from LoopStructural.utils import BoundingBox
-from LoopStructural.datatypes import Surface
+from LoopStructural.datatypes import Surface, BoundingBox
 
 surface_list = dict[str, tuple[npt.ArrayLike, npt.ArrayLike, npt.ArrayLike, npt.ArrayLike]]
 

LoopStructural/analysis/_fault_intersection.py

@@ -1,4 +1,3 @@
-
 vis = True
 try:
     pass

LoopStructural/analysis/_plane_fit.py

@@ -190,5 +190,6 @@ def regular_grid(self, nsteps=None, shuffle=False, order="C"):
             [xx.flatten(order=order), yy.flatten(order=order), zz.flatten(order=order)]
         ).T
         if shuffle:
+            # logger.info("Shuffling points")
             rng.shuffle(locs)
         return locs