Merge branch 'sliced_stream' of gitlab.idiap.ch:bob/bob.io.stream into sliced_stream

bob/io/stream/__init__.py

-from .stream_file import StreamFile
-from .stream import Stream
-
-# does that work?
-from .stream_filters import *
-
+from bob.io.stream.stream_file import StreamFile
+from bob.io.stream.stream import Stream, stream_filter, StreamFilter
+
+# import filters defined in stream.py
+from bob.io.stream.stream import AsType, \
+                                 StreamSelect, \
+                                 StreamView
+# import filters defined in stream_filters 
+from bob.io.stream.stream_filters import StreamColorMap, \
+                                         StreamNormalize, \
+                                         StreamClean, \
+                                         StreamStacked, \
+                                         StreamAdjust, \
+                                         StreamWarp, \
+                                         StreamStereo, \
+                                         StreamReproject, \
+                                         StreamSubtract
+
+# So that elements are available at package level, eg: bob.io.stream.Stream and not bob.io.stream.stream.Stream
+Stream.__module__ = "bob.io.stream"
+StreamFile.__module__ = "bob.io.stream"
+StreamFilter.__module__ = "bob.io.stream"
+stream_filter.__module__ = "bob.io.stream"
 
 def get_config():
     """Returns a string containing the configuration information.
-  """
+    """
 
     import bob.extension
 

bob/io/stream/stream.py

@@ -244,8 +244,7 @@ def stream_filter(name):
 ################################################################################
 # Stream Filters
 
-### default filter ###
-@stream_filter("filter")
+### Filter general class ###
 class StreamFilter(Stream):
     def __init__(self, name, parent):
         super().__init__(name=name, parent=parent)

bob/io/stream/stream_file.py

@@ -102,9 +102,9 @@ class StreamFile:
     # load stream data
     def load_stream_data(self, stream_name, index):
         data_config = self.get_stream_config(stream_name)
+        data_path = data_config["path"]
         if "use_config_from" in data_config:
             data_config = self.get_stream_config(data_config["use_config_from"])
-        data_path = data_config["path"]
 
         # load only relevant data
         if isinstance(index, int):

bob/io/stream/stream_filters.py

@@ -9,7 +9,7 @@ from .utils import convert_cv_to_bob, StreamArray
 from bob.ip.stereo import StereoParameters
 from bob.ip.stereo import stereo_match, reproject_image, CameraPair
 
-from .stream import stream_filter, Stream, StreamFilter
+from .stream import stream_filter, StreamFilter
 
 ### to_rgb ###
 @stream_filter("colormap")

conda/meta.yaml

@@ -27,7 +27,6 @@ requirements:
     - setuptools {{ setuptools }}
     - bob.io.base
     - bob.ip.stereo
-    - future
     - scikit-image
     - scipy
     - opencv
@@ -37,7 +36,6 @@ requirements:
     - setuptools
     - bob.io.base
     - bob.ip.stereo
-    - future
     - scikit-image
     - scipy
     - opencv

doc/conf.py

@@ -28,7 +28,7 @@ extensions = [
 
 # Be picky about warnings
 # TEMP: DO NOT be picky... fixes CI
-nitpicky = False
+nitpicky = True
 
 # Ignores stuff we can't easily resolve on other project's sphinx manuals
 nitpick_ignore = []

requirements.txt

@@ -2,7 +2,5 @@ setuptools
 numpy
 bob.io.base
 bob.ip.stereo
-future
-matplotlib
 scikit-image
 scipy