Simplified test_scatter and tox

ruaridhg · ruaridhg · commit 09cf069927b8 · 2023-06-01T16:14:40.000+01:00
diff --git a/src/napari_matplotlib/tests/test_scatter.py b/src/napari_matplotlib/tests/test_scatter.py
@@ -4,7 +4,6 @@
 import numpy as np
 import numpy.typing as npt
 import pytest
-from skimage.measure import regionprops_table
 
 from napari_matplotlib import FeaturesScatterWidget, ScatterWidget
 
@@ -36,21 +35,6 @@ def test_features_scatter_widget_2D(make_napari_viewer, astronaut_data):
 
     viewer.add_image(astronaut_data[0], **astronaut_data[1], name="astronaut")
 
-    # make a test label image
-    label_image = np.zeros((100, 100), dtype=np.uint16)
-    label_image[10:20, 10:20] = 1
-    label_image[50:70, 50:70] = 2
-    label_image * -1
-
-    feature_table_1 = regionprops_table(
-        label_image, properties=("label", "area", "perimeter")
-    )
-    feature_table_1["index"] = feature_table_1["label"]
-
-    viewer.add_labels(
-        label_image, name="label+features", features=feature_table_1
-    )
-
     # make the points data
     n_points = 100
     np.random.seed(10)
@@ -69,10 +53,8 @@ def test_features_scatter_widget_2D(make_napari_viewer, astronaut_data):
     viewer.layers.selection.add(
         viewer.layers["points_data"]
     )  # images need to be selected
-    x_column = "feature_0"
-    widget.x_axis_key = x_column
-    y_column = "feature_1"
-    widget.y_axis_key = y_column  # features need to be set here
+    widget.x_axis_key = "feature_0"
+    widget.y_axis_key = "feature_1"
 
     # Select label data and chosen features
     # viewer.layers.selection.add(viewer.layers["label+features"])
diff --git a/tox.ini b/tox.ini
@@ -19,4 +19,4 @@ commands =
     cp -R {toxinidir}/src/napari_matplotlib/tests/baseline {envdir}/baseline
     ls {toxinidir}/src/napari_matplotlib/tests/baseline
     python -c 'from skimage import data; data.brain()'
-    python -m pytest --mpl --mpl-baseline-path={toxinidir}/src/napari_matplotlib/tests/baseline --mpl-generate-summary=html --mpl-results-path={toxinidir}/reports -v --color=yes --cov=napari_matplotlib --cov-report=xml
+    python -m pytest --mpl --mpl-generate-summary=html --mpl-results-path={toxinidir}/reports -v --color=yes --cov=napari_matplotlib --cov-report=xml
