Merge pull request #175 from ImperialCollegeLondon/rename-typing

Rename typing module to avoid clash with built-in python module
ImperialCollegeLondon · Dec 7, 2024 · 9206e2a · 9206e2a
2 parents 54a3b89 + 98d6f8c
commit 9206e2a
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/pyprobe/analysis/cycling.py b/pyprobe/analysis/cycling.py
@@ -7,8 +7,8 @@
 
 from pyprobe.analysis.utils import AnalysisValidator
 from pyprobe.filters import Experiment, get_cycle_column
+from pyprobe.pyprobe_types import FilterToCycleType
 from pyprobe.result import Result
-from pyprobe.typing import FilterToCycleType
 
 
 def _create_capacity_throughput(

diff --git a/pyprobe/analysis/degradation_mode_analysis.py b/pyprobe/analysis/degradation_mode_analysis.py
@@ -15,8 +15,8 @@
 import pyprobe.analysis.base.degradation_mode_analysis_functions as dma_functions
 from pyprobe.analysis import smoothing, utils
 from pyprobe.analysis.utils import AnalysisValidator
+from pyprobe.pyprobe_types import FilterToCycleType, PyProBEDataType
 from pyprobe.result import Result
-from pyprobe.typing import FilterToCycleType, PyProBEDataType
 
 
 def _get_gradient(

diff --git a/pyprobe/analysis/differentiation.py b/pyprobe/analysis/differentiation.py
@@ -9,8 +9,8 @@
 
 import pyprobe.analysis.base.differentiation_functions as diff_functions
 from pyprobe.analysis.utils import AnalysisValidator
+from pyprobe.pyprobe_types import PyProBEDataType
 from pyprobe.result import Result
-from pyprobe.typing import PyProBEDataType
 
 
 @validate_call

diff --git a/pyprobe/analysis/pulsing.py b/pyprobe/analysis/pulsing.py
@@ -8,8 +8,8 @@
 
 from pyprobe.analysis.utils import AnalysisValidator
 from pyprobe.filters import Experiment, Step
+from pyprobe.pyprobe_types import PyProBEDataType
 from pyprobe.result import Result
-from pyprobe.typing import PyProBEDataType
 
 
 def _get_pulse_number(data: pl.DataFrame | pl.LazyFrame) -> pl.DataFrame | pl.LazyFrame:

diff --git a/pyprobe/analysis/smoothing.py b/pyprobe/analysis/smoothing.py
@@ -13,8 +13,8 @@
 from scipy.signal import savgol_filter
 
 from pyprobe.analysis.utils import AnalysisValidator
+from pyprobe.pyprobe_types import PyProBEDataType
 from pyprobe.result import Result
-from pyprobe.typing import PyProBEDataType
 
 
 @validate_call

diff --git a/pyprobe/analysis/utils.py b/pyprobe/analysis/utils.py
@@ -5,8 +5,8 @@
 from numpy.typing import NDArray
 from pydantic import BaseModel, model_validator
 
+from pyprobe.pyprobe_types import PyProBEDataType
 from pyprobe.result import Result
-from pyprobe.typing import PyProBEDataType
 
 
 def assemble_array(input_data: List[Result], name: str) -> NDArray[Any]:

diff --git a/pyprobe/filters.py b/pyprobe/filters.py
@@ -9,7 +9,7 @@
 from pyprobe.rawdata import RawData
 
 if TYPE_CHECKING:
-    from pyprobe.typing import (  # , FilterToStepType
+    from pyprobe.pyprobe_types import (  # , FilterToStepType
         ExperimentOrCycleType,
         FilterToCycleType,
     )

diff --git a/pyprobe/typing.py → pyprobe/pyprobe_types.py b/pyprobe/typing.py → pyprobe/pyprobe_types.py