Removing xfails on tests wip

Author: CyclingNinja

glue_jupyter/bqplot/scatter/layer_artist.py

@@ -116,7 +116,7 @@ def __init__(self, view, viewer_state, layer_state=None, layer=None):
 
         lines_gl_cls = LinesGL
         self.line_mark_gl = lines_gl_cls(scales=self.view.scales, x=[0.], y=[0.])
-        self.line_mark_gl.colors = [color2hex(self.state.color)]
+        self.line_mark_gl.color = [color2hex(self.state.color)]
         self.line_mark_gl.opacities = [self.state.alpha]
 
         # duplicate lines using base bqplot.Lines for linestyle default visible=False
@@ -147,7 +147,7 @@ def __init__(self, view, viewer_state, layer_state=None, layer=None):
 
         vector_lines_cls = bqplot.Lines
         self.vector_lines = vector_lines_cls(scales=self.view.scales, x=[0.], y=[0.])
-        self.vector_lines.colors = [color2hex(self.state.color)]
+        self.vector_lines.color = [color2hex(self.state.color)]
         self.vector_lines.visible = False
 
         # Density map
@@ -257,6 +257,7 @@ def _update_data(self):
             self.vector_mark.default_size = int(size * scale * 4)
             self.vector_mark.size = length
             self.vector_mark.rotation = angle
+            self.vector_mark.color = [color2hex(self.state.color)]
 
             vector_line_coords = self._build_line_vector_points(x, y, vx, vy)
             x_vector_coords = vector_line_coords[:, 0]
@@ -336,7 +337,7 @@ def _update_visual_attributes(self, changed, force=False):
 
         if self.state.line_visible:
             if force or "color" in changed:
-                self.line_mark_gl.colors = [color2hex(self.state.color)]
+                self.line_mark_gl.color = [color2hex(self.state.color)]
                 self.line_mark.colors = [color2hex(self.state.color)]
             if force or "linewidth" in changed:
                 self.line_mark_gl.stroke_width = self.state.linewidth
@@ -363,6 +364,8 @@ def _update_visual_attributes(self, changed, force=False):
                 if force or "color" in changed or "cmap_mode" in changed:
                     self.vector_mark.color = None
                     self.vector_mark.colors = [color2hex(self.state.color)]
+                    self.vector_lines.color = None
+                    self.vector_lines.colors = [color2hex(self.state.color)]
             elif force or any(prop in changed for prop in CMAP_PROPERTIES):
                 self.vector_mark.color = ensure_numerical(
                     self.layer[self.state.cmap_att].ravel(),

glue_jupyter/bqplot/scatter/tests/test_visual.py

@@ -77,7 +77,6 @@ def test_visual_scatter2d_density(
     return figure
 
 
-@pytest.mark.xfail
 @visual_widget_test
 def test_visual_linestyle(
     tmp_path,
@@ -107,8 +106,10 @@ def test_visual_linestyle(
     scatter.state.layers[0].linestyle = 'solid'
     scatter.state.layers[1].line_visible = True
     scatter.state.layers[1].linestyle = 'dashed'
+    scatter.state.layers[1].color = 'r'
     scatter.state.layers[2].line_visible = True
     scatter.state.layers[2].linestyle = 'dashdot'
+    scatter.state.layers[2].color = 'b'
 
     assert scatter.layers[0].line_mark_gl.visible
     assert not scatter.layers[1].line_mark_gl.visible
@@ -119,7 +120,6 @@ def test_visual_linestyle(
     return figure
 
 
-@pytest.mark.xfail
 @visual_widget_test
 def test_visual_vector(
     tmp_path,