Merge pull request #975 from ixjlyons/builtin-faulthandler

Remove pytest-faulthandler from test dependencies

.travis.yml

@@ -63,7 +63,12 @@ install:
       fi;
     - pip install pytest-xdist # multi-thread pytest
     - pip install pytest-cov # add coverage stats
-    - pip install pytest-faulthandler # activate faulthandler
+
+    # faulthandler support not built in to pytest for python 2.7
+    - if [ "${PYTHON}" == "2.7" ]; then
+        pip install pytest-faulthandler;
+        export PYTEST_ADDOPTS="--faulthandler-timeout=15";
+      fi;
 
     # Debugging helpers
     - uname -a

CONTRIBUTING.md

@@ -45,9 +45,12 @@ Please use the following guidelines when preparing changes:
 * pytest
 * pytest-cov
 * pytest-xdist
-* pytest-faulthandler
 * Optional: pytest-xvfb
 
+If you have pytest < 5, you may also want to install the pytest-faulthandler
+plugin to output extra debugging information in case of test failures. This
+isn't necessary with pytest 5+ as the plugin was merged into core pytest.
+
 ### Tox
 
 As PyQtGraph supports a wide array of Qt-bindings, and python versions, we make use of `tox` to test against most of the configurations in our test matrix.  As some of the qt-bindings are only installable via `conda`, `conda` needs to be in your `PATH`, and we utilize the `tox-conda` plugin.

azure-test-template.yml

@@ -98,7 +98,12 @@ jobs:
       else
         pip install $(qt.bindings) numpy scipy pyopengl pytest six coverage
       fi
-      pip install pytest-xdist pytest-cov pytest-faulthandler
+      pip install pytest-xdist pytest-cov
+      if [ $(python.version) == "2.7" ]
+      then
+        pip install pytest-faulthandler
+        export PYTEST_ADDOPTS="--faulthandler-timeout=15"
+      fi
     displayName: "Install Dependencies"
   
   - bash: |
@@ -194,4 +199,4 @@ jobs:
     inputs:
       codeCoverageTool: Cobertura
       summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'
-      reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'
+      reportDirectory: '$(System.DefaultWorkingDirectory)/**/htmlcov'

pytest.ini

@@ -4,7 +4,7 @@ xvfb_height = 1080
 # use this due to some issues with ndarray reshape errors on CI systems
 xvfb_colordepth = 24
 xvfb_args=-ac +extension GLX +render
-addopts = --faulthandler-timeout=15
+faulthandler_timeout = 15
 
 filterwarnings =
     # comfortable skipping these warnings runtime warnings
@@ -12,4 +12,4 @@ filterwarnings =
     ignore:numpy.ufunc size changed, may indicate binary incompatibility.*:RuntimeWarning
     # Warnings generated from PyQt5.9
     ignore:This method will be removed in future versions.  Use 'tree.iter\(\)' or 'list\(tree.iter\(\)\)' instead.:PendingDeprecationWarning
-    ignore:'U' mode is deprecated\nplugin = open\(filename, 'rU'\):DeprecationWarning
+    ignore:'U' mode is deprecated\nplugin = open\(filename, 'rU'\):DeprecationWarning

tox.ini

@@ -34,7 +34,6 @@ deps=
     {[base]deps}
     pytest-cov
     pytest-xdist
-    pytest-faulthandler
     pyside2-pip: pyside2
     pyqt5-pip: pyqt5