Merge branch 'develop' of github.com:pyannote/pyannote-core into develop

Author: hbredin

pyannote/core/notebook.py

@@ -341,7 +341,7 @@ def plot_feature(
     ):
 
         if not self.crop:
-            self.crop = feature.getExtent()
+            self.crop = feature.extent
 
         window = feature.sliding_window
         n, dimension = feature.data.shape
@@ -442,7 +442,8 @@ def repr_feature(feature: SlidingWindowFeature):
 
         plt.rcParams["figure.figsize"] = (notebook.width, 1.5 * num_overlap)
 
-        fig, axes = plt.subplots(nrows=num_overlap, ncols=1,)
+        fig, axes = plt.subplots(nrows=num_overlap, ncols=1, squeeze=False)
+        axes = axes.flatten()
         mini, maxi = np.nanmin(feature.data), np.nanmax(feature.data)
         ylim = (mini - 0.2 * (maxi - mini), maxi + 0.2 * (maxi - mini))
         for c, (window, data) in enumerate(feature):

tests/test_features.py

@@ -11,6 +11,13 @@ def features():
     window = SlidingWindow(start=0., step=1., duration=2.)
     return SlidingWindowFeature(data, window)
 
+@pytest.fixture
+def one_feature():
+    return SlidingWindowFeature(
+        np.array([ [[0, 0, 0]], [[1, 1, 1]] ]),
+        SlidingWindow()
+    )
+
 @pytest.fixture
 def segment():
     return Segment(3.3, 6.7)
@@ -47,3 +54,23 @@ def test_crop_fixed_out_of_bounds(features):
     expected = np.array([[0, 0, 0, 0, 1, 2, 3, 4, 5],
                          [10, 10, 10, 10, 11, 12, 13, 14, 15]]).T
     np.testing.assert_array_equal(expected, actual)
+
+def test_repr_png(features):
+    try:
+        import matplotlib
+        import IPython
+    except ModuleNotFoundError:
+        pytest.skip("notebook dependencies not available")
+    expected = b'\x89PNG'
+    actual = features._repr_png_()[:4]
+    assert expected == actual
+
+def test_repr_png_one_feature(one_feature):
+    try:
+        import matplotlib
+        import IPython
+    except ModuleNotFoundError:
+        pytest.skip("notebook dependencies not available")
+    expected = b'\x89PNG'
+    actual = one_feature._repr_png_()[:4]
+    assert expected == actual