Removed pytest-qt features

(compatibility issues with Qt6)

Author: PierreRaybaut

plotpy/tests/unit/test_builder_annotation.py

@@ -60,7 +60,7 @@ def _make_annotation(
         make.annotated_ellipse,
     ],
 )
-def test_builder_annotation_params(qtbot, method):
+def test_builder_annotation_params(method):
     items = []
     for show_label in [True, False]:
         items.append(
@@ -85,4 +85,4 @@ def test_builder_annotation_params(qtbot, method):
         items.append(_make_annotation(method, readonly=readonly))
     for private in [True, False]:
         items.append(_make_annotation(method, private=private))
-    show_items_qtbot(qtbot, items)
+    show_items_qtbot(items)

plotpy/tests/unit/test_builder_curve.py

@@ -7,20 +7,20 @@
 
 import numpy as np
 import pytest
+from guidata.qthelpers import exec_dialog
 from qtpy.QtCore import Qt
 from qwt import QwtPlotCurve
 
 from plotpy.builder import make
 
 
-def show_items_qtbot(qtbot, items, type="curve"):
+def show_items_qtbot(items, type="curve"):
     """Plot curve in a dialog"""
     win = make.dialog(type=type)
     plot = win.manager.get_plot()
     for item in items:
         plot.add_item(item)
-    win.show()
-    qtbot.keyClick(win, Qt.Key_Enter)
+    exec_dialog(win)
 
 
 _COLOR_TO_HEX = {"red": "#ff0000", "blue": "#0000ff"}
@@ -41,19 +41,19 @@ def _make_curve_style(shade, curvestyle, baseline):
 @pytest.mark.parametrize("shade", [0])
 @pytest.mark.parametrize("curvestyle", ["Lines", "Sticks", "Steps", "Dots", "NoCurve"])
 @pytest.mark.parametrize("baseline", [0.0])
-def test_builder_curve_curve_style(qtbot, shade, curvestyle, baseline):
+def test_builder_curve_curve_style(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
     curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("shade", [0, 0.4, 1.0])
 @pytest.mark.parametrize("curvestyle", ["Lines"])
 @pytest.mark.parametrize("baseline", [0.0, 1.0])
-def test_builder_curve_curve_shade_baseline(qtbot, shade, curvestyle, baseline):
+def test_builder_curve_curve_shade_baseline(shade, curvestyle, baseline):
     """Test curve parameters of curve() method"""
     curve = _make_curve_style(shade, curvestyle, baseline)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 def _make_curve_dsamp(dsamp_factor, use_dsamp):
@@ -68,18 +68,18 @@ def _make_curve_dsamp(dsamp_factor, use_dsamp):
 
 @pytest.mark.parametrize("dsamp_factor", [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 30, 50])
 @pytest.mark.parametrize("use_dsamp", [True])
-def test_builder_curve_dsamp_on(qtbot, dsamp_factor, use_dsamp):
+def test_builder_curve_dsamp_on(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=True"""
     curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("dsamp_factor", [1, 2])
 @pytest.mark.parametrize("use_dsamp", [False])
-def test_builder_curve_dsamp_off(qtbot, dsamp_factor, use_dsamp):
+def test_builder_curve_dsamp_off(dsamp_factor, use_dsamp):
     """Test downsampling parameters of curve() method: use_dsamp=False"""
     curve = _make_curve_dsamp(dsamp_factor, use_dsamp)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 def _make_curve_linestyle(color, linestyle, linewidth):
@@ -100,19 +100,19 @@ def _make_curve_linestyle(color, linestyle, linewidth):
     ["SolidLine", "DashLine", "DotLine", "DashDotLine", "DashDotDotLine", "NoPen"],
 )
 @pytest.mark.parametrize("linewidth", [1, 2])
-def test_builder_curve_line_style(qtbot, color, linestyle, linewidth):
+def test_builder_curve_line_style(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
     curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("color", ["red", "blue"])
 @pytest.mark.parametrize("linestyle", ["SolidLine"])
 @pytest.mark.parametrize("linewidth", [1, 2])
-def test_builder_curve_line_color(qtbot, color, linestyle, linewidth):
+def test_builder_curve_line_color(color, linestyle, linewidth):
     """Test line parameters of curve() method"""
     curve = _make_curve_linestyle(color, linestyle, linewidth)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 def _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor):
@@ -157,20 +157,20 @@ def _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor):
 @pytest.mark.parametrize("markerfacecolor", ["red"])
 @pytest.mark.parametrize("markeredgecolor", ["blue"])
 def test_builder_curve_marker_params_symbol(
-    qtbot, marker, markersize, markerfacecolor, markeredgecolor
+    marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
     curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")
 
 
 @pytest.mark.parametrize("marker", ["Cross"])
 @pytest.mark.parametrize("markersize", [1, 5, 10])
 @pytest.mark.parametrize("markerfacecolor", ["red", "blue"])
 @pytest.mark.parametrize("markeredgecolor", ["red", "blue"])
 def test_builder_curve_marker_size_color(
-    qtbot, marker, markersize, markerfacecolor, markeredgecolor
+    marker, markersize, markerfacecolor, markeredgecolor
 ):
     """Test marker parameters of curve() methodg"""
     curve = _make_curve_marker(marker, markersize, markerfacecolor, markeredgecolor)
-    show_items_qtbot(qtbot, [curve], "curve")
+    show_items_qtbot([curve], "curve")

plotpy/tests/unit/test_builder_image.py

@@ -59,56 +59,56 @@ def _make_image(
         LUTAlpha.TANH,
     ],
 )
-def test_builder_image_alpha_function(qtbot, alpha_function):
+def test_builder_image_alpha_function(alpha_function):
     item = _make_image(alpha_function=alpha_function)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize(
     "xdata,ydata", [[[None, None], [None, None]], [[-10, 10], [-10, 10]]]
 )
-def test_builder_image_xdata_ydata(qtbot, xdata, ydata):
+def test_builder_image_xdata_ydata(xdata, ydata):
     item = _make_image(xdata=xdata, ydata=ydata)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("pixel_size", [None, 1.0, (1.0, 2.0)])
-def test_builder_image_pixel_size(qtbot, pixel_size):
+def test_builder_image_pixel_size(pixel_size):
     item = _make_image(pixel_size=pixel_size)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("center_on", [None, [1.0, 3.0]])
-def test_builder_image_center_on(qtbot, center_on):
+def test_builder_image_center_on(center_on):
     item = _make_image(center_on=center_on, pixel_size=(1.0, 1.0))
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("interpolation", ["nearest", "linear", "antialiasing"])
-def test_builder_image_interpolation(qtbot, interpolation):
+def test_builder_image_interpolation(interpolation):
     item = _make_image(interpolation=interpolation)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("background_color", [None, "red"])
-def test_builder_image_background_color(qtbot, background_color):
+def test_builder_image_background_color(background_color):
     item = _make_image(background_color=background_color)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("eliminate_outliers", [None, 3.0])
-def test_builder_image_eliminate_outliers(qtbot, eliminate_outliers):
+def test_builder_image_eliminate_outliers(eliminate_outliers):
     item = _make_image(eliminate_outliers=eliminate_outliers)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("lut_range", [None, [0.0, 100.0]])
-def test_builder_image_lut_range(qtbot, lut_range):
+def test_builder_image_lut_range(lut_range):
     item = _make_image(lut_range=lut_range)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])
 
 
 @pytest.mark.parametrize("lock_position", [None, True, False])
-def test_builder_image_lock_position(qtbot, lock_position):
+def test_builder_image_lock_position(lock_position):
     item = _make_image(lock_position=lock_position)
-    show_items_qtbot(qtbot, [item])
+    show_items_qtbot([item])

plotpy/tests/unit/test_builder_shape.py

@@ -36,22 +36,22 @@ def _make_standard_shape(
     "method",
     [make.segment, make.rectangle, make.circle, make.ellipse],
 )
-def test_builder_standard_shape(qtbot, method):
+def test_builder_standard_shape(method):
     items = []
     items.append(_make_standard_shape(method, title="title"))
-    show_items_qtbot(qtbot, items)
+    show_items_qtbot(items)
 
 
-def test_builder_polygon(qtbot):
+def test_builder_polygon():
     items = []
     x = np.linspace(0, 1, 10)
     y = x**2
     for closed in [True, False]:
         items.append(make.polygon(x, y, closed=closed, title="title"))
-    show_items_qtbot(qtbot, items)
+    show_items_qtbot(items)
 
 
-def test_builder_svgshape(qtbot):
+def test_builder_svgshape():
     items = []
     svg_path = get_path("svg_target.svg")
     with open(svg_path, "rb") as f:
@@ -63,4 +63,4 @@ def test_builder_svgshape(qtbot):
             items.append(
                 make.svg(shape_str, data_or_path, 0.0, 0.0, 1.0, 1.0, title="title")
             )
-    show_items_qtbot(qtbot, items)
+    show_items_qtbot(items)

plotpy/tests/unit/test_plot_curve.py

@@ -6,7 +6,7 @@
 """Test plotting of a curve with PlotDialog"""
 
 import numpy as np
-from qtpy.QtCore import Qt
+from guidata.qthelpers import exec_dialog
 from qwt import QwtPlotItem
 
 from plotpy.builder import make
@@ -19,7 +19,7 @@
 )
 
 
-def test_plot_curve(qtbot):
+def test_plot_curve():
     """Test plotting of a curve with PlotDialog"""
 
     x = np.linspace(-10, 10, 200)
@@ -31,7 +31,6 @@ def test_plot_curve(qtbot):
     plot = win.manager.get_plot()
     plot.add_item(curve)
 
-    qtbot.addWidget(win)
     win.show()
 
     assert isinstance(win.plot_widget, PlotWidget)
@@ -47,10 +46,10 @@ def test_plot_curve(qtbot):
         tool = win.manager.get_tool(curve_tool_class)
         assert tool is not None, f"Tool of type {curve_tool_class} not found"
 
-    qtbot.keyClick(win, Qt.Key_Enter)
+    exec_dialog(win)
 
 
-def test_plot_curve_anti_aliasing(qtbot):
+def test_plot_curve_anti_aliasing():
     """Test Anti-aliasing tool"""
 
     x = np.linspace(-10, 10, 200)
@@ -61,7 +60,6 @@ def test_plot_curve_anti_aliasing(qtbot):
     plot = win.manager.get_plot()
     plot.add_item(curve)
 
-    qtbot.addWidget(win)
     win.show()
 
     assert isinstance(win.plot_widget, PlotWidget)
@@ -86,4 +84,4 @@ def test_plot_curve_anti_aliasing(qtbot):
     aliased_img = plot.grab().toImage()
     assert original_img == aliased_img
 
-    qtbot.keyClick(win, Qt.Key_Enter)
+    exec_dialog(win)