build: bumpy pyqtgraph from 0.12.1 to 0.12.2

Author: paulmueller

CHANGELOG

@@ -2,6 +2,8 @@
  - fix: correctly handle missing features on data export (#80)
  - setup: bump dclab from 0.34.2 to 0.34.3 (set R_HOME)
  - build: bumpy rpy2 from 3.4.2 to 3.4.5
+ - build: bumpy pyqtgraph from 0.12.1 to 0.12.2 and remove
+   colorbar export workarounds
 2.6.6
  - fix: false alarms about wrong pyqtgraph version on startup
    (removed the responsible code, because there are now more regular

setup.py

@@ -29,7 +29,7 @@
                       "h5py>=2.8.0",
                       "numpy>=1.9.0",
                       "pyqt5",
-                      "pyqtgraph==0.12.1",
+                      "pyqtgraph==0.12.2",
                       "requests",
                       "scipy>=0.13.0"],
     python_requires='>=3.6, <4',

shapeout2/gui/widgets/so_colorbaritem.py

@@ -1,49 +1,16 @@
-from distutils.version import LooseVersion
-import pathlib
-import warnings
-
 import pyqtgraph as pg
 
 
-if LooseVersion(pg.__version__) > "0.12.1":
-    warnings.warn("New version of pyqtgraph detected! Please remove the "
-                  "imageAxisOrder workaround, remove this case structure and "
-                  "update setup.py with the new version.")
-else:
-    # Temporary fix for https://github.com/pyqtgraph/pyqtgraph/issues/1866.
-    # Only modifies the AxisItem code in-place. This means that the location
-    # has to be writable. For frozen applications, it has to be run before
-    # freezing (e.g. during tests).
-    axis_item_path = pathlib.Path(pg.graphicsItems.AxisItem.__file__)
-    if axis_item_path.suffix == ".py" and axis_item_path.exists():
-        lines = axis_item_path.read_text(encoding="utf-8").split("\n")
-        for ii, line in enumerate(lines):
-            if (line.count("resolves some damn pixel ambiguity")
-                    and not line.strip().startswith("#")):
-                lines[ii] = "# " + line
-                try:
-                    axis_item_path.write_text("\n".join(lines),
-                                              encoding="utf-8")
-                except BaseException:
-                    warnings.warn("Could not patch AxisItem for ColorBarItem!")
-
-
 class ShapeOutColorBarItem(pg.ColorBarItem):
     def __init__(self, yoffset, height, label, *args, **kwargs):
         """pg.ColorBarItem modified for Shape-Out
 
-        - Workaround for https://github.com/pyqtgraph/pyqtgraph/issues/1720
-          which is not in pyqtgraph 0.12.1
         - Added option to define height
         - translate the colorbar so that it is aligned with the plot
         - show the label on the right-hand axis
         - increase the contents margins
         """
-        # workaround for pyqtgraph 0.12.1, which does not yet include
-        # https://github.com/pyqtgraph/pyqtgraph/issues/1720
-        pg.setConfigOption('imageAxisOrder', 'col-major')
         super(ShapeOutColorBarItem, self).__init__(*args, **kwargs)
-        pg.setConfigOption('imageAxisOrder', 'row-major')
 
         for key in ['left', 'top', 'bottom']:
             axis = self.getAxis(key)