Merge pull request #5368 from markotoplak/pyqtgraph-0.11.1

Require pyqtgraph>=0.11.1

Author: markotoplak

Orange/widgets/visualize/tests/test_owlineplot.py

@@ -160,14 +160,6 @@ def test_selection_line(self):
         pos_down, pos_up = QPointF(2.38, 4.84), QPointF(3.58, 4.76)
         mapToParent = self.widget.graph.view_box.childGroup.mapToParent
 
-        # On pyqtgraph < 0.11.1 mapping does not work unless the widget is shown
-        # Delete when Orange stops supporting pyqtgraph < 0.11.1,
-        to_and_back = self.widget.graph.view_box.childGroup.mapFromParent(
-            mapToParent(pos_down))
-        successful_mapping = (to_and_back - pos_down).manhattanLength() < 0.001
-        if not successful_mapping:  # on pyqtgraph < 0.11.1
-            mapToParent = lambda x: x
-
         event.buttonDownPos.return_value = mapToParent(pos_down)
         event.pos.return_value = mapToParent(pos_up)
 
@@ -180,12 +172,6 @@ def test_selection_line(self):
         self.widget.graph.view_box.mouseClickEvent(event)
         self.assertListEqual(self.widget.selection, [])
 
-    def test_remove_old_pyqtgraph_support(self):
-        # When 0.11.2 is released there is probably time to drop support
-        # for pyqtgraph <= 0.11.0:
-        # - remove test_selection_line workaround for 0.11.0
-        self.assertLess(pyqtgraph.__version__, "0.11.2")
-
     @patch("Orange.widgets.visualize.owlineplot.SEL_MAX_INSTANCES", 100)
     def test_select_lines_enabled(self):
         self.send_signal(self.widget.Inputs.data, self.data[::2])

Orange/widgets/visualize/utils/plotutils.py

@@ -508,13 +508,6 @@ def setRotateTicks(self, rotate):
         self.prepareGeometryChange()
         self.update()
 
-    # remove after Orange requires pyqtgraph >= 0.11.1
-    if pg.__version__ <= "0.11.0":
-        def generateDrawSpecs(self, p):
-            if self.style["tickFont"]:
-                p.setFont(self.style["tickFont"])
-            return super().generateDrawSpecs(p)
-
     def drawPicture(self, p, axisSpec, tickSpecs, textSpecs):
         if self.orientation in ["bottom", "top"] and self.style["rotateTicks"]:
             p.setRenderHint(p.Antialiasing, False)
@@ -550,15 +543,3 @@ def drawPicture(self, p, axisSpec, tickSpecs, textSpecs):
             self._updateMaxTextSize(max_text_size + offset)
         else:
             super().drawPicture(p, axisSpec, tickSpecs, textSpecs)
-
-    # remove after Orange requires pyqtgraph >= 0.11.1
-    if pg.__version__ <= "0.11.0":
-        def _updateMaxTextSize(self, x):
-            if self.orientation in ["left", "right"]:
-                self.textWidth = x
-                if self.style["autoExpandTextSpace"] is True:
-                    self._updateWidth()
-            else:
-                self.textHeight = x
-                if self.style["autoExpandTextSpace"] is True:
-                    self._updateHeight()

Orange/widgets/visualize/utils/tests/test_plotutils.py

@@ -7,16 +7,6 @@
 from Orange.widgets.visualize.utils.plotutils import InteractiveViewBox
 
 
-class TestAxisItem(unittest.TestCase):
-    def test_remove_old_pyqtgraph_support(self):
-        from pyqtgraph import __version__
-        # When 0.11.2 is released there is probably time to drop support
-        # for pyqtgraph <= 0.11.0:
-        # - remove AxisItem.generateDrawSpecs
-        # - remove AxisItem._updateMaxTextSize
-        self.assertLess(__version__, "0.11.2")
-
-
 class TestInteractiveViewBox(unittest.TestCase):
 
     def test_update_scale_box(self):

conda-recipe/meta.yaml

@@ -46,7 +46,7 @@ requirements:
     - xlsxwriter
     - anyqt >=0.0.11
     - pyqt >=5.12,!=5.15.1
-    - pyqtgraph >=0.11.0
+    - pyqtgraph >=0.11.1
     - joblib >=0.9.4
     - keyring
     - keyrings.alt

requirements-gui.txt

@@ -5,5 +5,5 @@ PyQt5>=5.12,!=5.15.1  # 5.15.1 skipped because of QTBUG-87057 - affects select c
 PyQtWebEngine>=5.12
 AnyQt>=0.0.11
 
-pyqtgraph>=0.11.0
+pyqtgraph>=0.11.1
 matplotlib>=2.0.0