build: fix potential issues on macOS by using latest pyqtgraph

ZELLMECHANIK-DRESDEN · Jul 3, 2019 · ef2c891 · ef2c891
1 parent c198960
commit ef2c891
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -29,8 +29,8 @@
                       "h5py>=2.8.0",
                       "numpy>=1.9.0",
                       "pyqt5",
-                      "pyqtgraph>=0.10.0",
-                      #"pyqtgraph @ git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c",
+                      #"pyqtgraph>=0.10.0",
+                      "pyqtgraph @ git+https://github.com/pyqtgraph/pyqtgraph.git@1ec175385e31c4e1e8dbe829b4387e4ac560082c",
                       "scipy>=0.13.0"],
     python_requires='>=3.6, <4',
     setup_requires=['pytest-runner'],

diff --git a/shapeout2/__main__.py b/shapeout2/__main__.py
@@ -5,8 +5,7 @@ def main(splash=True):
     import time
 
     from PyQt5.QtWidgets import QApplication
-    # required by pyqtgraph
-    QApplication.setGraphicsSystem("raster")
+    import pyqtgraph  # import before creating application
 
     app = QApplication(sys.argv)
     imdir = pkg_resources.resource_filename("shapeout2", "img")