Fix for nptyping>=2 (#101)

BlueBrain · Apr 20, 2022 · 97731fa · 97731fa
1 parent 79b4394
commit 97731fa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/neuror/main.py b/neuror/main.py
@@ -19,7 +19,7 @@
 from neurom.core.dataformat import COLS
 from neurom.core import Section
 from neurom.features.section import branch_order, section_path_length
-from nptyping import NDArray
+from nptyping import NDArray, Shape, Float
 from scipy.spatial.distance import cdist
 
 from neuror import axon, cut_plane
@@ -234,10 +234,10 @@ def __init__(self,  # pylint: disable=too-many-arguments
                  inputfile: Path,
                  axons: Optional[Path] = None,
                  seed: Optional[int] = 0,
-                 cut_leaves_coordinates: Optional[NDArray[(3, Any)]] = None,
+                 cut_leaves_coordinates: Optional[NDArray[Shape["3"], Any]] = None,
                  legacy_detection: bool = False,
                  repair_flags: Optional[Dict[RepairType, bool]] = None,
-                 apical_point: NDArray[3, float] = None,
+                 apical_point: NDArray[Shape["3"], Float] = None,
                  params: Dict = None):
         '''Repair the input morphology
 
@@ -677,7 +677,7 @@ def repair(inputfile: Path,  # pylint: disable=too-many-arguments
            outputfile: Path,
            axons: Optional[List[Path]] = None,
            seed: int = 0,
-           cut_leaves_coordinates: Optional[NDArray[(3, Any)]] = None,
+           cut_leaves_coordinates: Optional[NDArray[Shape["3"], Any]] = None,
            legacy_detection: bool = False,
            plot_file: Optional[Path] = None,
            repair_flags: Optional[Dict[RepairType, bool]] = None,

diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
         'morphio>=3.0.0,<4.0',
         'neurom>=3.0.1,<4.0',
         'numpy>=1.19.2',
-        'nptyping>=1.3.0',
+        'nptyping>=2',
         'pandas>=0.24.2',
         'pyquaternion>=0.9.2',
         'scipy>=1.2.0',