From e33c9dc1b2ce060ec49a2899f883eb92bea253a9 Mon Sep 17 00:00:00 2001 From: Lachlan Grose Date: Tue, 4 Jun 2024 12:46:55 +1000 Subject: [PATCH] fix: remove api for now, Isosurfacer in utils --- LoopStructural/api/__init__.py | 1 - LoopStructural/modelling/features/_base_geological_feature.py | 2 +- LoopStructural/utils/__init__.py | 2 ++ LoopStructural/{api => utils}/_surface.py | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) delete mode 100644 LoopStructural/api/__init__.py rename LoopStructural/{api => utils}/_surface.py (99%) diff --git a/LoopStructural/api/__init__.py b/LoopStructural/api/__init__.py deleted file mode 100644 index 71c4a62f..00000000 --- a/LoopStructural/api/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from ._surface import LoopIsosurfacer, surface_list diff --git a/LoopStructural/modelling/features/_base_geological_feature.py b/LoopStructural/modelling/features/_base_geological_feature.py index 5eefc6f1..755da17f 100644 --- a/LoopStructural/modelling/features/_base_geological_feature.py +++ b/LoopStructural/modelling/features/_base_geological_feature.py @@ -5,7 +5,7 @@ from LoopStructural.modelling.features import FeatureType from LoopStructural.utils import getLogger from LoopStructural.utils.typing import NumericInput -from LoopStructural.api import LoopIsosurfacer, surface_list +from LoopStructural.utils import LoopIsosurfacer, surface_list from LoopStructural.datatypes import VectorPoints import numpy as np diff --git a/LoopStructural/utils/__init__.py b/LoopStructural/utils/__init__.py index ed647777..82055e44 100644 --- a/LoopStructural/utils/__init__.py +++ b/LoopStructural/utils/__init__.py @@ -34,3 +34,5 @@ import numpy as np rng = np.random.default_rng() + +from ._surface import LoopIsosurfacer, surface_list diff --git a/LoopStructural/api/_surface.py b/LoopStructural/utils/_surface.py similarity index 99% rename from LoopStructural/api/_surface.py rename to LoopStructural/utils/_surface.py index 8caaf64e..a88f605e 100644 --- a/LoopStructural/api/_surface.py +++ b/LoopStructural/utils/_surface.py @@ -3,7 +3,7 @@ from typing import Optional, Union, Callable, List import numpy as np import numpy.typing as npt -from LoopStructural.utils import getLogger +from LoopStructural.utils.logging import getLogger logger = getLogger(__name__) try: