Merge pull request #1547 from pijyoi/cleanup_ci

remove ProgressDialog from CI test

examples/test_examples.py

@@ -70,10 +70,6 @@ conditionalExamples = {
         False,
         reason="Test is being problematic on CI machines"
     ),
-    "ProgressDialog.py": exceptionCondition(
-        not(platform.system() == "Linux"),
-        reason="QXcbConnection: XCB error"
-    ),
     'GLVolumeItem.py': exceptionCondition(
         not(platform.system() == "Darwin" and
             tuple(map(int, platform.mac_ver()[0].split("."))) >= (10, 16) and 

examples/utils.py

@@ -108,7 +108,6 @@ others = dict([
     ('DateAxisItem_QtDesigner', 'DateAxisItem_QtDesigner.py'),
     ('GraphicsScene', 'GraphicsScene.py'),
     ('MouseSelection', 'MouseSelection.py'),
-    ('ProgressDialog', 'ProgressDialog.py'),
 ])
 
 
@@ -118,3 +117,8 @@ trivial = dict([
     ('LogPlotTest', 'LogPlotTest.py'),  # Plotting.py
     ('ViewLimits', 'ViewLimits.py'),    # ViewBoxFeatures.py
 ])
+
+# examples that are not suitable for CI testing
+skiptest = dict([
+    ('ProgressDialog', 'ProgressDialog.py'),    # modal dialog
+])

pyqtgraph/exporters/SVGExporter.py

@@ -199,7 +199,7 @@ def _generateItemSvg(item, nodes=None, root=None, options={}):
         svg = QtSvg.QSvgGenerator()
         svg.setOutputDevice(buf)
         dpi = QtGui.QGuiApplication.primaryScreen().logicalDotsPerInchX()
-        svg.setResolution(dpi)
+        svg.setResolution(int(dpi))
 
         p = QtGui.QPainter()
         p.begin(svg)

pyqtgraph/tests/image_testing.py

@@ -603,7 +603,7 @@ def runSubprocess(command, return_code=False, **kwargs):
     if p.returncode != 0:
         print(output)
         err_fun = sp.CalledProcessError.__init__
-        if 'output' in inspect.getargspec(err_fun).args:
+        if 'output' in inspect.getfullargspec(err_fun).args:
             raise sp.CalledProcessError(p.returncode, command, output)
         else:
             raise sp.CalledProcessError(p.returncode, command)