Relax h5py constraint (#857)

and remove the deprecated fst/ files
BlueBrain · Nov 26, 2020 · f9561c8 · f9561c8
1 parent aa94eb5
commit f9561c8
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 392 deletions.
diff --git a/benchmarks/benchmarks.py b/benchmarks/benchmarks.py
@@ -2,7 +2,7 @@
 
 import neurom as nm
 import neurom.io
-import neurom.fst._core
+from neurom.fst._core import FstNeuron
 from neurom.check import neuron_checks as nc
 from neurom.check import structural_checks as sc
 
@@ -114,7 +114,7 @@ class TimeChecks:
     def setup(self):
         path = Path(DATA_DIR, 'h5/v1/bio_neuron-000.h5')
         self.data_wrapper = neurom.io.load_data(path)
-        self.neuron = neurom.fst._core.FstNeuron(self.data_wrapper)
+        self.neuron = FstNeuron(self.data_wrapper)
 
     def time_has_sequential_ids(self):
         sc.has_sequential_ids(self.data_wrapper)

diff --git a/neurom/fst/__init__.py b/neurom/fst/__init__.py
@@ -1,9 +1,5 @@
-"""Legacy module, replaced by neurom.features."""
-from warnings import warn
-from neurom.features import neuritefunc as _neuritefunc
-from neurom.features import neuronfunc as _neuronfunc
-from neurom.features import sectionfunc
+"""This module used to have all fst related function that were deprecated and now removed.
 
-from neurom.features import NEURITEFEATURES, NEURONFEATURES, get, register_neurite_feature
-warn('neurom.fst is being deprecated and will be removed in NeuroM v1.5.0,'
-     ' replace it by neurom.features', DeprecationWarning)
+The class FstNeuron is still here and has not been moved to a better
+suited plane since moving it would imply a breaking change.
+"""
diff --git a/neurom/fst/_bifurcationfunc.py b/neurom/fst/_bifurcationfunc.py
diff --git a/neurom/fst/_neuritefunc.py b/neurom/fst/_neuritefunc.py
diff --git a/neurom/fst/_neuronfunc.py b/neurom/fst/_neuronfunc.py
diff --git a/neurom/fst/sectionfunc.py b/neurom/fst/sectionfunc.py
diff --git a/neurom/fst/tests/test_bifurcationfunc.py b/neurom/fst/tests/test_bifurcationfunc.py
diff --git a/neurom/fst/tests/test_feature_compat.py b/neurom/fst/tests/test_feature_compat.py
diff --git a/neurom/fst/tests/test_get_features.py b/neurom/fst/tests/test_get_features.py
diff --git a/neurom/fst/tests/test_neuritefunc.py b/neurom/fst/tests/test_neuritefunc.py